diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-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) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-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) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-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) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-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) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-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) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-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) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-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) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-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) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-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) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9adca50..96a4f65 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -4,12 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   deptId: '',
@@ -35,21 +36,15 @@
 const loadingTable = ref(false)
 // 初始化路由
 // 培训时间数组
-const trainTimeArr = ref([
-  listQuery.value.trainStartTime,
-  listQuery.value.trainEndTime,
-])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([
-  listQuery.value.createStartTime,
-  listQuery.value.createEndTime,
-])
+const createTime = ref('')
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,7 +59,7 @@
 fetchData(true)
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
     value: 'planNo',
@@ -143,8 +138,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -277,7 +272,7 @@
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -288,7 +283,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-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) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9adca50..96a4f65 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -4,12 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   deptId: '',
@@ -35,21 +36,15 @@
 const loadingTable = ref(false)
 // 初始化路由
 // 培训时间数组
-const trainTimeArr = ref([
-  listQuery.value.trainStartTime,
-  listQuery.value.trainEndTime,
-])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([
-  listQuery.value.createStartTime,
-  listQuery.value.createEndTime,
-])
+const createTime = ref('')
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,7 +59,7 @@
 fetchData(true)
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
     value: 'planNo',
@@ -143,8 +138,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -277,7 +272,7 @@
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -288,7 +283,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f4fc979..9377a9e 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -6,6 +6,7 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   createEndTime: '',
@@ -27,17 +28,17 @@
 // 主管部门下拉框
 const options = ref([])
 // 培训时间数组
-const trainTimeArr = ref([])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([])
+const createTime = ref('')
 const loadingTable = ref(false)
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -52,7 +53,7 @@
 fetchData(true)
 
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '记录编号',
     value: 'logNo',
@@ -119,8 +120,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -239,7 +240,7 @@
             value-format="YYYY-MM-DD h:m:s"
           /> -->
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -250,7 +251,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"

diff --git a/src/api/business/task.ts b/src/api/business/task.ts
new file mode 100644
index 0000000..a337c7f
--- /dev/null
+++ b/src/api/business/task.ts
@@ -0,0 +1,35 @@
+/**
+ * 任务分发
+*/
+import request from '../index'
+import type { ITaskQuery } from '@/views/business/schedule/task/task-interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getTaskList(data: ITaskQuery) {
+  return request({
+    url: `${prefix}/schedule/task/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportTaskList(data: Omit<ITaskQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/task/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 检测流程配置
+export function interchangeListTake(data: { id: string; scheduleId: string }) {
+  return request({
+    url: `${prefix}/schedule/task/setSchedule`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/Approval/ApprovalDialog.vue b/src/components/Approval/ApprovalDialog.vue
index fd06b2b..2fb919e 100644
--- a/src/components/Approval/ApprovalDialog.vue
+++ b/src/components/Approval/ApprovalDialog.vue
@@ -108,10 +108,10 @@
               <el-radio label="agree" size="large">
                 同意
               </el-radio>
-              <el-radio label="refuse" size="large">
+              <el-radio label="reject" size="large">
                 驳回
               </el-radio>
-              <el-radio label="reject" size="large">
+              <el-radio label="refuse" size="large">
                 拒绝
               </el-radio>
             </el-radio-group>
diff --git a/src/components/dialog/selectEmployeesDialog.vue b/src/components/dialog/selectEmployeesDialog.vue
index 9bcac13..4b5d0e4 100644
--- a/src/components/dialog/selectEmployeesDialog.vue
+++ b/src/components/dialog/selectEmployeesDialog.vue
@@ -14,6 +14,21 @@
     type: Array,
     default: () => [],
   },
+  // 默认查询组织
+  deptId: {
+    type: String,
+    default: '',
+  },
+  // 是否显示部门选择下拉菜单
+  showDeptSelect: {
+    type: Boolean,
+    default: true,
+  },
+  // 是否多选
+  multi: {
+    type: Boolean,
+    default: true,
+  },
 })
 const emits = defineEmits(['update:visible', 'change'])
 const table = ref() // 表格ref
@@ -32,11 +47,20 @@
 // 查询参数
 const listQuery = reactive({
   keywords: '',
+  beginTime: '',
+  endTime: '',
+  deptId: '',
   offset: 1,
   limit: 10,
+  sort: 'id',
+  deptType: '',
 })
+// 默认给deptId赋值
+listQuery.deptId = props.deptId
+const checkedList = ref([])
 // 多选的数据
 const multipleTable = ref([])
+const singleChecked = ref('') // 单选选中id
 const closeDialog = () => {
   emits('update:visible', false)
 }
@@ -58,15 +82,27 @@
 
 // 点击确定，保存选择的成员配置
 const saveDialog = () => {
-  const checkedList = multipleTable.value.map((item: IEmployees) => ({
-    ...item,
-    type: 1, // type: 1.成员 2.角色
-    targetId: item.id,
-    name: item.name,
-  }))
-  emits('change', checkedList)
+  // 多选
+  if (props.multi) {
+    const checkedList = multipleTable.value.map((item: IEmployees) => {
+      return {
+        ...item,
+        type: 1, // type: 1.成员 2.角色
+        // targetId: item.roleId,
+        // name: item.roleName,
+        targetId: item.id,
+        name: item.name,
+      }
+    })
+    emits('change', checkedList)
+  }
+  else {
+    const checkValue = list.value.find(item => item.id == singleChecked.value)
+    emits('change', checkValue)
+  }
 }
 
+const select = ref('')
 // 获取列表数据
 const fetchData = (isNowPage = false) => {
   if (!isNowPage) {
@@ -120,12 +156,18 @@
           </search-item>
         </search-area>
         <!-- 表头标题 -->
-        <table-container>
+        <table-container :title-show="false" style="margin-top: 0;padding-top: 0;">
           <!-- 查询结果Table显示 -->
           <normal-table
             ref="table"
-            :data="list" :total="total" :columns="columns" :query="listQuery"
-            :list-loading="loading" :is-showmulti-select="true" @change="changePage" @multiSelect="multiSelect"
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            :list-loading="loading"
+            :is-showmulti-select="multi"
+            @change="changePage"
+            @multi-select="multiSelect"
           >
             <!-- 序号 -->
             <template #preColumns>
@@ -134,6 +176,11 @@
                   {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
                 </template>
               </el-table-column>
+              <el-table-column v-if="!props.multi" label="" width="40" align="center">
+                <template #default="scope">
+                  <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+                </template>
+              </el-table-column>
             </template>
             <!-- 状态 -->
             <template #columns>
@@ -148,6 +195,7 @@
           </normal-table>
         </table-container>
       </div>
+      <!-- </div> -->
       <template #footer>
         <el-button @click="closeDialog">
           取 消
@@ -188,6 +236,10 @@
     flex: 1;
     overflow: auto;
 
+    :deep(.el-radio__label) {
+      display: none;
+    }
+
     .pagination {
       margin-top: 10px;
       width: 100%;
diff --git a/src/global.d.ts b/src/global.d.ts
index 1f2bb9d..dde63b4 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -290,3 +290,10 @@
     children: recordRaw[]
   }
 }
+
+// 字典
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
diff --git a/src/views/business/schedule/task/components/chooseLab.vue b/src/views/business/schedule/task/components/chooseLab.vue
index 6e9f1fb..3a3c09c 100644
--- a/src/views/business/schedule/task/components/chooseLab.vue
+++ b/src/views/business/schedule/task/components/chooseLab.vue
@@ -34,7 +34,7 @@
 // 表格加载状态
 const loadingTable = ref(false)
 // 多选的内容
-const checkoutList = ref<string[]>([])
+const checkoutList = ref<ILabList[]>([])
 // 单选
 const singleChecked = ref()
 // 数据查询
@@ -99,18 +99,35 @@
 
 // 点击取消
 const cancle = () => {
-  emits('changeVisible', false)
+  dialogVisible.value = false
 }
 // 点击确定
 const clickConfirm = () => {
-  console.log(checkoutList.value)
-  if (!checkoutList.value.length) {
-    ElMessage({
-      message: '请选中',
-      type: 'warning',
-    })
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
   }
-  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()
 }
 
@@ -158,8 +175,8 @@
           :pagination="false"
           @multi-select="handleSelectionChange"
         >
-          <template #preColumns>
-            <el-table-column v-if="!multi" label="" width="40" align="center">
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="" width="40" align="center">
               <template #default="scope">
                 <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
               </template>
diff --git a/src/views/business/schedule/task/components/processConfig.vue b/src/views/business/schedule/task/components/processConfig.vue
new file mode 100644
index 0000000..4ccab04
--- /dev/null
+++ b/src/views/business/schedule/task/components/processConfig.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+const props = defineProps({
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess = {
+  id: '', // 检测节点id
+  executiveItem: '', // 检测项目
+  executiveDept: '', // 检测部门
+  executiveDeptName: '', // 检测部门
+  executivePerson: '', // 检测人员
+  executivePersonName: '', // 检测人员
+  measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+  measureStateName: '', // 检测状态
+  currentCertifications: '', // 当前证书数
+  requireCertifications: '', // 应出具证书数
+  updateTime: '', // 更新时间
+  backPerson: '', // 退回人
+  backReason: '', // 退回原因
+  backTime: '', // 退回时间
+  distributePerson: '', // 分配人
+  distributeTime: '', // 分配时间
+  startTime: '', // 检测开始时间
+  overTime: '', // 检测结束时间
+}
+// 检定流程列表
+const processList = ref([
+  { ...defaultProcess },
+])
+
+// 获取当前样品检测流程，参数待定
+const fetchProcess = () => {
+  // TODO: 模拟数据
+  processList.value = [
+    {
+      id: '1', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423635973935106', // 检测部门
+      executiveDeptName: '力学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '张三', // 检测人员
+      measureState: '2', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待检测', // 检测状态
+      currentCertifications: '0', // 当前证书数
+      requireCertifications: '2', // 应出具证书数
+      updateTime: '2023-02-01 09:00:05', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+    {
+      id: '2', // 检测节点id
+      executiveItem: '', // 检测项目
+      executiveDept: '1601423577505337346', // 检测部门
+      executiveDeptName: '热学实验室', // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '1', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '待分配', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    },
+  ]
+}
+fetchProcess()
+
+// 点击添加流程
+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 = {
+      id: '',
+      executiveItem: '', // 检测项目
+      executiveDept: item.deptId, // 检测部门
+      executiveDeptName: item.organizeName, // 检测部门
+      executivePerson: '', // 检测人员
+      executivePersonName: '', // 检测人员
+      measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+      measureStateName: '', // 检测状态
+      currentCertifications: '', // 当前证书数
+      requireCertifications: '', // 应出具证书数
+      updateTime: '', // 更新时间
+      backPerson: '', // 退回人
+      backReason: '', // 退回原因
+      backTime: '', // 退回时间
+      distributePerson: '', // 分配人
+      distributeTime: '', // 分配时间
+      startTime: '', // 检测开始时间
+      overTime: '', // 检测结束时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  // TODO: 保存流程
+  console.log(processList.value)
+  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" @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/schedule/task/components/processNode.vue b/src/views/business/schedule/task/components/processNode.vue
index f56f1f3..39817f4 100644
--- a/src/views/business/schedule/task/components/processNode.vue
+++ b/src/views/business/schedule/task/components/processNode.vue
@@ -3,42 +3,40 @@
   Aim, Rank, Remove,
 } from '@element-plus/icons-vue'
 import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
 
 // 逻辑代码
 const props = defineProps({
   // 默认数据
-  default: {
+  modelValue: {
     type: Object,
     default: () => {
       return {
-        id: '',
-        step: 1,
-        executiveItem: '',
-        executiveDept: '',
-        executivePerson: '',
-        measureState: '',
-        currentCertifications: '',
-        requireCertifications: '',
-        updateTime: '',
-        backPerson: '',
-        backReason: '',
-        backTime: '',
-        distributePerson: '',
-        distributeTime: '',
-        startTime: '',
-        overTime: '',
+        id: '', // 检测节点id
+        executiveItem: '', // 检测项目
+        executiveDept: '', // 检测部门
+        executiveDeptName: '', // 检测部门
+        executivePerson: '', // 检测人员
+        executivePersonName: '', // 检测人员
+        measureState: '0', // 检测状态:待分发，待分配，待检测，检测中，检测完，退回，取消
+        measureStateName: '', // 检测状态
+        currentCertifications: '', // 当前证书数
+        requireCertifications: '', // 应出具证书数
+        updateTime: '', // 更新时间
+        backPerson: '', // 退回人
+        backReason: '', // 退回原因
+        backTime: '', // 退回时间
+        distributePerson: '', // 分配人
+        distributeTime: '', // 分配时间
+        startTime: '', // 检测开始时间
+        overTime: '', // 检测结束时间
       }
     },
   },
-  // 检定环节可编辑
-  deptEdit: {
+  // 是否为详情展示页面-暂时无用
+  detail: {
     type: Boolean,
-    default: true,
-  },
-  // 人员和证书数可编辑
-  personEdit: {
-    type: Boolean,
-    default: true,
+    default: false,
   },
   // 步骤
   step: {
@@ -46,25 +44,34 @@
     default: 1,
   },
 })
-
-const processNodeData = ref({
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '',
-  measureStateName: '',
-  currentCertifications: 0,
-  requireCertifications: 0,
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
+const emit = defineEmits(['update:modelValue', 'delete'])
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  return processNodeData.value.measureState == '0'
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['0', '1']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['0', '1', '2']
+  return editStates.includes(processNodeData.value.measureState)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['0']
+  return editStates.includes(processNodeData.value.measureState)
 })
 
 // 选择实验室
@@ -72,6 +79,29 @@
 const clickChoose = () => {
   chooseLabDialog.value.initDialog(false)
 }
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.executiveDept = lab.deptId
+  processNodeData.value.executiveDeptName = lab.organizeName
+}
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.executivePerson = person.id
+  processNodeData.value.executivePersonName = person.name
+  choosePersonShow.value = false
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
 </script>
 
 <template>
@@ -81,10 +111,10 @@
         {{ props.step }}
       </div>
       <div class="buttons">
-        <el-icon class="icon-button" title="移除">
+        <el-icon v-show="canMove" class="icon-button" title="移除" @click="deleteNode">
           <remove />
         </el-icon>
-        <el-icon class="icon-button handle" title="移动">
+        <el-icon v-show="canMove" class="icon-button handle" title="移动">
           <rank />
         </el-icon>
       </div>
@@ -92,26 +122,34 @@
     <div>
       <div class="line">
         <span class="label">检定环节</span>
-        <el-input v-model="processNodeData.executiveDept" class="process-input" size="small" :disabled="!props.deptEdit">
-          <template #append>
+        <el-input v-model="processNodeData.executiveDeptName" class="process-input" readonly size="small" :disabled="!deptEdit">
+          <template v-if="deptEdit" #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.executivePerson" class="process-input" size="small" :disabled="!props.personEdit" />
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.executivePersonName" readonly class="process-input" size="small" :disabled="!personEdit">
+          <template v-if="personEdit" #append>
+            <el-button :icon="Aim" size="small" link @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="!props.personEdit" /><span class="unit"> 份</span>
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit" /><span class="unit"> 份</span>
       </div>
-      <div v-show="processNodeData.measureStateName" class="line">
+      <div class="line">
         <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStateName }}</span>
       </div>
-      <div v-show="processNodeData.updateTime" class="line">
+      <div class="line">
         <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
       </div>
     </div>
-    <choose-lab ref="chooseLabDialog" />
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-employees-dialog v-model:visible="choosePersonShow" :data="[processNodeData.executivePerson]" :dept-id="processNodeData.executiveDept" :multi="false" @change="choosePersonOver" />
   </div>
 </template>
 
@@ -119,12 +157,13 @@
 .process-node {
   // display: inline-block;
   margin-right: 10px;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px solid #e0e0e0;
   padding: 5px 15px;
   border-radius: 5px;
   background-color: #fafafa;
+  margin-bottom: 10px;
 
   .header {
     display: flex;
diff --git a/src/views/business/schedule/task/components/processNodeAdd.vue b/src/views/business/schedule/task/components/processNodeAdd.vue
index 78d563d..d7aeea0 100644
--- a/src/views/business/schedule/task/components/processNodeAdd.vue
+++ b/src/views/business/schedule/task/components/processNodeAdd.vue
@@ -18,7 +18,7 @@
 <style lang="scss" scoped>
 .process-node {
   // display: inline-block;
-  width: 250px;
+  width: 280px;
   height: 215px;
   border: 1px dashed #e0e0e0;
   padding: 5px 15px;
diff --git a/src/views/business/schedule/task/task-interface.ts b/src/views/business/schedule/task/task-interface.ts
index ec114e6..c9b3d63 100644
--- a/src/views/business/schedule/task/task-interface.ts
+++ b/src/views/business/schedule/task/task-interface.ts
@@ -1,3 +1,5 @@
+import type { ISampleEdit } from '@/views/customer/sample/list/sample_list_interface'
+
 // 任务列表查询条件
 export interface ITaskQuery {
   sampleNo: string // 样品编号
@@ -12,8 +14,9 @@
   offset: number
 }
 
-// 任务列表
+// 任务列表-返回值
 export interface ITaskList {
+  orderId: string // 委托书编号
   sampleId: string // 样品唯一标识
   sampleNo: string // 样品编号
   sampleName: string // 样品名称
@@ -32,9 +35,10 @@
   requireCertifications: number // 应出具证书总数
   labelBind: string // 绑定标签
   distributeState: string // 分发性质-初次分发、退回分发
+  distributeStateName: string // 分发性质-初次分发、退回分发
 }
 
-// 流程
+// 检测流程节点
 export interface ISchedule {
   executivePerson: string // 执行人
   executivePersonName: string // 执行人名称
@@ -53,3 +57,8 @@
   startTime: string // 检定开始时间
   overTime: string // 检定完成时间
 }
+
+// 样品检测信息
+export interface ISampleMeasure extends ISampleEdit {
+  orderId: string // 委托单id
+}
diff --git a/src/views/business/schedule/task/taskEdit.vue b/src/views/business/schedule/task/taskEdit.vue
index e2ccbbf..c8331c1 100644
--- a/src/views/business/schedule/task/taskEdit.vue
+++ b/src/views/business/schedule/task/taskEdit.vue
@@ -4,15 +4,13 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { ref } from 'vue'
-import draggable from 'vuedraggable'
-import ProcessNode from './components/processNode.vue'
-import ProcessNodeAdd from './components/processNodeAdd.vue'
-import chooseLab from './components/chooseLab.vue'
-import type { ISampleEdit, SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import TemplateTable from '@/views/customer/customerInfo/templateTable.vue'
-import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getDictByCode } from '@/api/system/dict'
@@ -21,11 +19,10 @@
   name: string
   value: string
 }
-const pageType = ref('distribute') // 页面类型: distribute待分发, dispatch待分配
+const pageType = ref('distribute') // 页面类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员)
 const countryList = ref(countries) // 国家列表
 const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const visible = ref(false) // 控制对话框显隐
+const infoId = ref('') // 样品详情id
 const mesureCategoryList = ref<dictType[]>([]) // 校检类别
 const mesureTypeList = ref<dictType[]>([]) // 检定方式
 
@@ -42,8 +39,9 @@
 }
 getDict()
 
-const dataForm: Ref<ISampleEdit> = ref({
+const dataForm: Ref<ISampleMeasure> = ref({
   id: '',
+  orderId: '', // 委托单id
   sampleNo: '', // 样品编号
   sampleName: '', // 样品名称
   sampleModel: '', // 样品型号
@@ -87,32 +85,6 @@
   mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
 }) // 表单验证规则
 
-const defaultProcess = {
-  id: '',
-  step: 1,
-  executiveItem: '',
-  executiveDept: '',
-  executivePerson: '',
-  measureState: '0',
-  measureStateName: '',
-  currentCertifications: '',
-  requireCertifications: '',
-  updateTime: '',
-  backPerson: '',
-  backReason: '',
-  backTime: '',
-  distributePerson: '',
-  distributeTime: '',
-  startTime: '',
-  overTime: '',
-}
-// 检定流程列表
-const processList = ref([
-  { ...defaultProcess },
-])
-const processAdd = () => {
-  processList.value.push({ ...defaultProcess, step: processList.value.length + 1 })
-}
 // 其他关联数据列表
 const dataList = ref({
   measureRecords: [] as SimpleMeasureRecord[],
@@ -194,13 +166,13 @@
   extarCss: '',
 })
 
-// 保存
+// 保存样品信息
 function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
   formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-        '确认保存吗？',
+        '确认修改样品信息吗？',
         '提示',
         {
           confirmButtonText: '确认',
@@ -218,41 +190,16 @@
             }
           })
         }
-        else {
-          addSample(dataForm.value).then((res) => {
-            if (res.code === 200) {
-              dataForm.value.id = res.data.id
-              dataForm.value.customerNo = res.data.customerNo
-              ElMessage.success('已保存')
-              $router.go(-1)
-            }
-          })
-        }
       })
     }
   })
 }
 
-// 提交表单
-function submitForm() {
-  if (dataForm.value.id) {
-    const params = {
-      id: dataForm.value.id,
-      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
-    }
-    addSample(params).then((res) => {
-      ElMessage.success('提交成功')
-      close()
-    })
-  }
-  else {
-    ElMessage.info('请先保存再提交！')
-  }
-}
-
+// 获取样品详情
 const getInfo = () => {
   // getSapmleDetail({ id: infoId.value }).then((res) => {
   dataForm.value = {
+    orderId: '123',
     ABC: 'A',
     companyAddress: '北京/北京市',
     customerName: '京东集团',
@@ -283,20 +230,49 @@
   // }
   // })
 }
-// 选择实验室弹窗
-const chooseLabDialog = ref()
-// 批量添加流程
-const batchProcessAdd = () => {
-  chooseLabDialog.value.initDialog(true)
-}
+
 // 点击标签绑定的扫描
 const startScan = () => {
+  // TODO
+}
 
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
 }
-// 非添加页面获取详情
-if (pageType.value !== 'add') {
-  getInfo()
+// 保存流程按钮点击
+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) {
+    //     dataForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+// 获取样品详情
+getInfo()
 </script>
 
 <template>
@@ -601,20 +577,14 @@
     </detail-page>
     <detail-block title="检定流程">
       <template #btns>
-        <el-button type="primary" @click="batchProcessAdd">
+        <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>
-      <div style="display: flex;flex-wrap: wrap;">
-        <draggable v-model="processList" item-key="id" style="display: flex;flex-wrap: wrap;" handle=".handle">
-          <template #item="{ process, index }">
-            <process-node :default="process" :step="index + 1" :dept-edit="pageType === 'distribute'" :person-edit="pageType === 'dispatch' || pageType === 'distribute'" />
-          </template>
-          <template #footer>
-            <process-node-add @click="processAdd" />
-          </template>
-        </draggable>
-      </div>
+      <process-config ref="processConfigRef" :order-id="dataForm.orderId" :sample-id="dataForm.id!" />
     </detail-block>
     <!-- 检定记录、检定证书 -->
     <detail-block-switch v-if="pageType === 'detail'" :title="currentMenu">
@@ -627,7 +597,6 @@
       </template>
       <template-table v-if="currentMenuObj" :columns="currentMenuObj.columns" :list="dataList[currentMenuObj.list]" :loading="false" :pagination="currentMenuObj.pagination" @change-page="currentMenuObj?.searchFunc" />
     </detail-block-switch>
-    <choose-lab ref="chooseLabDialog" />
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index b5622d6..663b571 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -2,13 +2,15 @@
 import { getCurrentInstance, ref } from 'vue'
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import type { ITaskList, ITaskQuery } from './task-interface'
+import DistributeDialog from './components/distributeDialog.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
-import { deleteCustomer, exportCustomerList, getCustomerList } from '@/api/customer/customer'
 import { getDictByCode } from '@/api/system/dict'
+import { exportTaskList, getTaskList } from '@/api/business/task'
+import type { dictType } from '@/global'
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 查询条件
@@ -21,15 +23,13 @@
   customerName: '', // 委托方名称
   isUrgent: '', // 是否加急
   sampleAttr: '', // 样品属性
-  formId: 'jlglsygfsp',
+  startTime: '', // 应检完时间-开始
+  endTime: '', // 应检完时间-结束
+  formId: 'jlglsygfsp', // 任务分发formId
   offset: 1,
   limit: 20,
 })
-interface dictType {
-  id: string
-  name: string
-  value: string
-}
+// --------------获取所需字典值----------------
 const sampleAttrList = ref<dictType[]>([]) // 样品属性列表
 function getDict() {
   // 获取样品属性
@@ -38,6 +38,7 @@
   })
 }
 getDict()
+
 // 表头
 const columns = ref<TableColumn[]>([
   { text: '样品编号', value: 'sampleNo', width: '110', align: 'center' },
@@ -63,8 +64,7 @@
 const loadingTable = ref(false)
 // 选中的内容
 const checkoutList = ref<string[]>([])
-// 文件上传input
-const fileRef = ref()
+
 // 数据查询
 function fetchData(isNowPage = false) {
   loadingTable.value = true
@@ -72,23 +72,14 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 模拟数据
   list.value = [
-    { sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
-    { sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123456', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '1', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '1', distributeStateName: '初次分发' },
+    { orderId: '1', sampleNo: '1yp123457', sampleName: '压力表', orderNo: 'wtd123456', customerNo: 'kh123456', customerName: '北京无线电测量研究所', isUrgent: '0', sampleAttr: '1', sampleAttrName: '客户样品', sampleModel: 'JBT-011', manufacturingNo: '24432231124', requireOverTime: '2023-02-01', sampleId: '1', currentMeasureState: '1', currentMeasureStateName: '待分配', currentCertifications: 0, requireCertifications: 0, labelBind: '', distributeState: '2', distributeStateName: '退回分发' },
   ]
   loadingTable.value = false
-  // getCustomerList(listQuery.value).then((response) => {
-  //   // 模拟数据
-  //   response.data.rows = [{ bankAccount: '银行账户', bankAccountNumber: '银行账号', bankName: '工商银行', briefName: '京东', businessContent: '电商', businessScope: 'test1', grade: '1', gradeName: 'A', companySize: '1', companySizeName: '小微企业', businessSize: '1', businessSizeName: '0-10万', evaluation: '1', evaluationName: '优质', companyAddress: '五棵松', companyAreaName: '海淀区', companyCityName: '北京市', companyCountryName: '中国', companyProvinceName: '北京', companyArea: '110007', companyCity: '110000', companyCountry: 'CN', companyProvince: '100000', createTime: '2022-11-29 21:14:50', director: '刘强东', fax: 'test1', id: '1597579843411234817', invoiceAddress: '五棵松', invoiceAreaName: '海淀区', invoiceCityName: '北京市', invoiceCountryName: '中国', invoiceProvinceName: '北京', invoiceyArea: '110007', invoiceCity: '110000', invoiceCountry: 'CN', invoiceProvince: '100000', mailbox: 'test1', minioFileName: 'test', mobile: 'test', phone: '950618', postalCode: 'test', remark: 'test', customerName: '京东集团', customerNo: 'sygf202211290001', taxNumber: 'test', updateTime: '2023-01-10 09:56:57', website: 'test' }]
-  //   list.value = response.data.rows.map((item: ITaskList) => {
-  //     if (item.companyProvinceName && item.companyCityName) {
-  //       item.briefName = `${item.companyProvinceName}/${item.companyCityName}`
-  //     }
-  //     else {
-  //       item.briefName = item.companyProvinceName || item.companyCityName
-  //     }
-  //     return item
-  //   })
+  // getTaskList(listQuery.value).then((response) => {
+  //   list.value = response.data.rows
   //   total.value = parseInt(response.data.total)
   //   loadingTable.value = false
   // })
@@ -104,8 +95,9 @@
 }
 
 // 点击分发， 弹窗
+const distributeDialogRef = ref()
 const handleDistribute = (row: ITaskList) => {
-  // $router.push(`/schedule/task/${pageType}/${row.sampleId}`)
+  distributeDialogRef.value.initDialog(row.orderId, row.sampleId)
 }
 
 // 点击搜索
@@ -276,6 +268,7 @@
           </el-table-column>
         </template>
       </normal-table>
+      <distribute-dialog ref="distributeDialogRef" @close="fetchData" />
     </table-container>
   </app-container>
 </template>
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 7bfd090..8fec470 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
@@ -9,6 +10,7 @@
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
+import { printJSON } from '@/utils/printUtils'
 const props = defineProps({
   status: {
     type: String,
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -98,10 +103,14 @@
 const deleteId = ref('')
 // 详情id
 const infoId = ref('0')
+// 装载时间数组
+const checkTime = ref<string>('')
 // 点击按钮
 const buttonType = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.checkStartDate = checkTime.value[0] || ''
+  listQuery.value.checkEndDate = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -191,8 +200,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref<string[]>([listQuery.value.checkStartDate, listQuery.value.checkEndDate])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -211,7 +218,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -339,15 +346,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '设备检修保养验收单', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -386,7 +408,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -398,9 +420,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -416,7 +438,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 44335a6..4ff3806 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup name="listMaintenanceApproval">
 import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../checkList_interface'
@@ -8,6 +9,7 @@
 import { deleteEquipmentApply, getEquipmentApplyList, submitEquipmentApply } from '@/api/device/checkList'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   status: {
@@ -21,9 +23,12 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -118,8 +123,12 @@
 const infoId = ref('0')
 // 点击按钮
 const buttonType = ref('')
+// 装载时间数组
+const checkTime = ref('')
 const loadingTable = ref(false)
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.startTime = checkTime.value[0] || ''
+  listQuery.value.endTime = checkTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -209,8 +218,6 @@
 const cancelEvent = () => {
   console.log('cancel!')
 }
-// 装载时间数组
-const checkTimeArr = ref([listQuery.value.startTime, listQuery.value.endTime])
 // 点击重置
 const clearList = () => {
   listQuery.value = {
@@ -230,7 +237,7 @@
     offset: 1,
     limit: 20,
   }
-  checkTimeArr.value = []
+  checkTime.value = ''
 }
 // 点击跳转
 const add = () => {
@@ -358,15 +365,30 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplierTable {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '设备检修保养验收单列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplierTable) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备检修保养验收单列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -405,7 +427,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="checkTimeArr"
+          v-model="checkTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -417,9 +439,9 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/lis/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/device/maintenance/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -435,7 +457,7 @@
                 :type="item.type" link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true">{{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index a3129d4..0a3dd34 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -567,7 +567,8 @@
             <el-input
               v-if="item.text !== '有效日期'"
               v-model="scope.row[item.value]"
-              :placeholder="`${item.text}`"
+              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
+              :disabled="pageType === 'detail'"
               class="input"
             />
             <el-date-picker
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 1efebea..6f1ff1a 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -8,7 +8,6 @@
 import type { ISupplier } from '../checkList_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-// import { getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { getAddCheckInfo, getselectCheckInfo } from '@/api/device/checkList'
 import { validatePhone } from '@/utils/validate'
 import { SCHEDULE } from '@/utils/scheduleDict'
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index efb2643..ce6000d 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/check/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/check/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index 5c474a1..aecaa95 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/device/maintenance/list/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/device/maintenance/list/delete' },
   ],
 
 }
diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue
index 9556d73..25550ab 100644
--- a/src/views/device/deviceMaintenance/manageCheckList.vue
+++ b/src/views/device/deviceMaintenance/manageCheckList.vue
@@ -22,6 +22,7 @@
 const show = ref(true)
 // 表格数据
 const list = ref<ISupplier[]>([])
+// 获取权限
 const { proxy } = getCurrentInstance() as any
 // 总数
 const total = ref(0)
@@ -254,11 +255,11 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-if="proxy.hasPerm('/measure/measureSource/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+          <!-- <icon-button v-if="proxy.hasPerm('/measure/measureSource/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/mould')" icon="icon-template" title="模板下载" type="primary" /> -->
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/device/manage/check/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
@@ -274,10 +275,10 @@
                   type="primary"
                   @click="handleEdit(row, 'detail')"
                 >
-                  查看
+                  详情
                 </el-button>
                 <el-button
-                  v-if="proxy.hasPerm('/measure/measureSource/delete')"
+                  v-if="proxy.hasPerm('/device/manage/check/list/delete')"
                   size="small"
                   link
                   type="danger"
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index 275ed66..b28f5d6 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -1,13 +1,15 @@
 <script lang="ts" setup name="ListSource">
 import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
+import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
@@ -19,7 +21,7 @@
     default: '',
   },
   buttoms: {
-    type: Array,
+    type: Array as PropType<Ibuttoms[]>,
     default: () => [],
   },
   applyType: {
@@ -41,6 +43,7 @@
   createUser: '',
   equipmentNo: '',
   organizeNo: '',
+  formId: props.schedule,
   standardName: '',
   standardNo: '',
   limit: 20,
@@ -55,7 +58,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '申请编号',
     value: 'applyNo',
@@ -132,12 +135,6 @@
 const fileRef = ref()
 // 审批弹窗开关
 const applyShow = ref(false)
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
 const loadingTable = ref(false)
 // 获取部门信息参数
 const DeptParams = ref({
@@ -313,6 +310,7 @@
     applyStatus: '',
     applyType: props.applyType,
     approvalStatus: props.approvalStatus,
+    formId: props.schedule,
     createUser: '',
     equipmentNo: '',
     organizeNo: '',
@@ -386,9 +384,11 @@
   }
   fetchData(true)
 }
+// 上传功能
 const upload = () => {
   fileRef.value.click()
 }
+// 上传
 const uploadAll = () => {
   upload()
 }
@@ -407,6 +407,7 @@
     },
   })
 }
+// 导出
 const exportAll = () => {
   exportExcelBtn()
 }
@@ -415,15 +416,30 @@
   emit('setData', newVal)
 },
 { deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置申请列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置申请列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 审批弹窗的提交
 const applyListSubmit = () => {
   console.log(applyList.value)
@@ -489,7 +505,7 @@
         <template #btns-right>
           <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
           <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
         <normal-table
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index e022442..fca74d7 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -480,6 +480,7 @@
       }
     })
     formInline.value = res.data
+    formInline.value.standardEquipmentId = res.data.id
   })
 }
 if (pageType.value !== 'add') {
@@ -695,7 +696,7 @@
         >
           {{ item }}
         </el-button>
-        <el-button type="warning" @click="close">
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
@@ -1099,26 +1100,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="3">
-            <el-form-item label="附件:">
-              <el-upload
-                v-model:file-list="fileList"
-                enctype="multipart/form-data"
-                :http-request="uploadQuarterlyEvaluateFile"
-                :before-remove="beforeRemove"
-                :on-exceed="handleExceed"
-                :on-preview="uploadShow"
-                :on-change="handleFileChange"
-                :limit="1"
-              >
-                <el-button :disabled="buttonType === '查看'">
-                  上传
-                </el-button>
-              </el-upload>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="备注:">
@@ -1135,9 +1116,6 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <!-- <el-button v-if="pageType !== 'detail'" type="primary">
-          批量选择
-        </el-button> -->
         <el-button
           v-if="pageType !== 'detail'"
           type="primary"
@@ -1282,46 +1260,6 @@
 </template>
 
 <style lang="scss" scoped>
-// 样式
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 2vh;
-  padding: 5px;
-  width: 100%;
-  height: 6vh;
-  background-color: rgb(233 231 231);
-}
-
-.info-content {
-  padding: 15px;
-  border-radius: 10px;
-  background-color: #fff;
-}
-
-.dialog-buts {
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-}
-
 :deep .el-input .el-input--default .el-input--suffix {
   width: 200px !important;
 }
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 2792a21..9a9c992 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -4,6 +4,7 @@
 import { getUserList } from '@/api/system/user'
 import { getDeptTreeList } from '@/api/system/dept'
 import type { TreeStructure } from '@/views/system/user/user-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 const props = defineProps({
   list: {
     type: Array,
@@ -20,7 +21,7 @@
 const loadingTable = ref<boolean>(false)
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '设备名称',
     value: 'name',
@@ -62,7 +63,7 @@
     align: 'center',
   },
 ])
-const list = ref([{ name: '张三' }])
+const list = ref<object[]>([])
 // 搜索
 const search = () => {
   list.value = props.list.filter(item => item.name === listQuery.value.name)
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 2504fd6..0b15289 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions } from '../standard_interface'
+import type { IOptions } from '../../standard_interface'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
@@ -158,25 +158,6 @@
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
 const fileRef = ref() // 文件上传input
-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) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
 const upload = () => {
   fileRef.value.click()
 }
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 6b06354..5e7a7ca 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -1,18 +1,21 @@
 <script lang="ts" setup name="standardList">
-import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-const listQuery = ref({
-  category: null,
+const listQuery: Ref<IexpiraListQuery> = ref({
+  category: '',
   id: null,
-  managerState: null,
+  managerState: '',
   preparationEndDate: '',
   preparationStartDate: '',
-  standardLaboratory: null,
+  standardLaboratory: '',
   standardName: '',
   standardNo: '',
   validEndTime: '',
@@ -20,10 +23,12 @@
   offset: 1,
   limit: 20,
 })
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 const list = ref([]) // 存放数据
 const isShow = ref(true) // 控制新增页面是否显示
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -86,8 +91,16 @@
 const standardManagerStateList = ref<IOptions[]>([])
 // 标准所在部门下拉框
 const standardUsersDeptList = ref<IOptions[]>([])
+// 筹建日期
+const preparation = ref<string>('')
+// 到期开始以及结束
+const validTime = ref<string>('')
 // 获取数据
 const fetchData = (isNowPage: boolean) => {
+  listQuery.value.preparationStartDate = preparation.value[0] || ''
+  listQuery.value.preparationEndDate = preparation.value[1] || ''
+  listQuery.value.validStartTime = validTime.value[0] || ''
+  listQuery.value.validEndTime = validTime.value[1] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -137,27 +150,15 @@
 getUsersDept(DeptParams.value).then((res) => {
   standardUsersDeptList.value = res.data.rows
 })
-
-// 筹建日期数组
-const preparationArr = ref([
-  listQuery.value.preparationStartDate,
-  listQuery.value.preparationEndDate,
-])
-// 到期开始以及结束数组
-const validTimeArr = ref([
-  listQuery.value.validStartTime,
-  listQuery.value.validStartTime,
-])
-
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    category: null,
+    category: '',
     id: null,
-    managerState: null,
+    managerState: '',
     preparationEndDate: '',
     preparationStartDate: '',
-    standardLaboratory: null,
+    standardLaboratory: '',
     standardName: '',
     standardNo: '',
     validEndTime: '',
@@ -165,8 +166,8 @@
     offset: 1,
     limit: 20,
   }
-  preparationArr.value = []
-  validTimeArr.value = []
+  preparation.value = ''
+  validTime.value = ''
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
 const changePage = (val: { size?: number; page?: number }) => {
@@ -182,15 +183,30 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '到期提醒模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 导出id类型
+interface ISupplier {
+  id: never
+}
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '到期提醒列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '到期提醒列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 // 导出
 const exportExcelBtn = () => {
@@ -359,7 +375,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="preparationArr"
+          v-model="preparation"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -370,7 +386,7 @@
       </search-item>
       <search-item>
         <el-date-picker
-          v-model="validTimeArr"
+          v-model="validTime"
           type="datetimerange"
           range-separator="到"
           format="YYYY/MM/DD HH:mm:ss"
@@ -382,8 +398,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/standard/expiration/remind/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -401,6 +417,7 @@
                 详情
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/warn')"
                 size="small"
                 link
                 type="primary"
@@ -409,6 +426,7 @@
                 提醒
               </el-button>
               <el-button
+                v-if="proxy.hasPerm('/standard/expiration/remind/delete')"
                 size="small"
                 link
                 type="danger"
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 8fa1bc7..216f572 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -1,29 +1,31 @@
 <script lang="ts" setup name="standardList">
+import type { Ref } from 'vue'
 import { getCurrentInstance, ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, IlistType } from './standard_interface'
+import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { exportExcel } from '@/utils/exportXlsx'
+import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
-
-const listQuery = ref({
-  standardNo: '',
-  standardName: '',
-  category: '',
-  managerState: null,
-  standardLaboratory: null,
-  preparationDate: null,
+// 列表查询条件
+const listQuery: Ref<IlistQuerys> = ref({
+  standardNo: '', // 标准代码
+  standardName: '', // 标准名称
+  category: '', // 类别
+  managerState: '', // 管理状态
+  standardLaboratory: '', // 标准所在部门
+  preparationDate: '', // 筹建日期
   id: null,
-  offset: 1,
-  limit: 20,
+  offset: 1, // 当前页
+  limit: 20, // 多少条
 })
 const list = ref([]) // 存放数据
-const isShow = ref(true) // 控制新增页面是否显示
 // 获得权限
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '标准代码',
     value: 'standardNo',
@@ -84,10 +86,6 @@
 const loadingTable = ref(false)
 // 选中的数据
 const checkoutList = ref([])
-// 编辑或者详情id
-const infoId = ref('')
-// 点击的类型
-const buttonType = ref('')
 // 类别下拉框
 const checkTypeOptions = ref<IOptions[]>([])
 // 管理状态下拉框
@@ -108,6 +106,10 @@
   })
 }
 fetchData(true)
+// 导出id类型
+interface ISupplier {
+  id: never
+}
 // 点击搜索
 const searchList = () => {
   fetchData(true)
@@ -150,9 +152,9 @@
     standardNo: '', // 标准代码
     standardName: '', // 标准名称
     category: '', // 类别
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
+    managerState: '',
+    standardLaboratory: '',
+    preparationDate: '',
     id: null,
     offset: 1,
     limit: 10,
@@ -172,15 +174,26 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e
 }
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '标准装置列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item: TableColumn) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '标准装置列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '标准装置列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 // 导出
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
@@ -215,7 +228,6 @@
 }
 // 关闭
 const close = () => {
-  isShow.value = true
   fetchData(true)
 }
 // 点击导出
@@ -254,13 +266,10 @@
 const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
   $router.push(`/standard/${pageType}/${row.id}`)
 }
-const renderHeader = (e: any) => {
-  console.log(e)
-}
 </script>
 
 <template>
-  <app-container v-if="isShow">
+  <app-container>
     <search-area
       :need-clear="true"
       @search="searchList" @clear="clearList"
@@ -311,7 +320,7 @@
       </search-item>
       <search-item style="width: 15%;">
         <el-select
-          v-model.trim="listQuery.standardLaboratory"
+          v-model="listQuery.standardLaboratory"
           clearable
           placeholder="标准所在部门"
           size="default"
@@ -339,11 +348,11 @@
       <template #btns-right>
         <icon-button v-if="proxy.hasPerm('/standard/list/add')" icon="icon-add" title="新建" type="primary" @click="addList" />
         <icon-button v-if="proxy.hasPerm('/standard/list/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-if="proxy.hasPerm('/standard/list/print')" v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/standard/list/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange" @renderHeader="renderHeader"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
       >
         <template #columns>
           <el-table-column label="操作" align="center" width="180">
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index aa5845f..8917584 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -1,3 +1,4 @@
+// 标准装置列表以及提醒数据类型
 export interface IlistType {
   standardNo: string
   standardName: string
@@ -11,6 +12,7 @@
   remark: string
 }
 
+// 查询条件类型
 export interface IlistQuery {
   applyNo: string
   applyStatus: string
@@ -19,12 +21,26 @@
   createUser: string
   equipmentNo: string
   organizeNo: string
+  formId: string
   standardName: string
   standardNo: string
   limit: number
   offset: number
 }
 
+// 标准装置列表查询条件类型
+export interface IlistQuerys {
+  standardNo: string
+  standardName: string
+  category: string
+  managerState: string
+  standardLaboratory: string
+  preparationDate: string
+  id: null | string
+  offset: number
+  limit: number
+}
+// 申请表格数据类型
 export interface IlistTypes {
   applyNo: string
   applyTypeName: string
@@ -37,3 +53,34 @@
   createTime: string
   approvalStatusName: string
 }
+
+// 下拉框类型
+export interface IOptions {
+  name: string
+  id: string
+  value: string
+  organizeName: string
+  deptId?: string
+}
+
+// 到期提醒列表查询条件类型
+export interface IexpiraListQuery {
+  category: string
+  id: null | string
+  managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
+  standardLaboratory: string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
+  offset: number
+  limit: number
+}
+
+// 按钮类型
+export interface Ibuttoms {
+  type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  name: string
+}
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 4cab873..6c094bd 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -25,35 +25,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/measure/measureSource/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/measure/measureSource/approve/delete' },
   ],
 
 }
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
index 467148d..181c46d 100644
--- a/src/views/measure/source/components/listApproval.vue
+++ b/src/views/measure/source/components/listApproval.vue
@@ -1,10 +1,12 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
-import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '../list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
@@ -19,9 +21,11 @@
 })
 const emit = defineEmits(['setData']) // 关闭
 
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -287,15 +291,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '溯源供方审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '溯源供方审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 
 onActivated(() => {
   fetchData(true)
@@ -324,9 +339,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/measure/measureSource/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
         </template>
         <normal-table
           :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -342,7 +357,7 @@
                   :type="item.type" link
                   @click="clickBtn(row, item.name)"
                 >
-                  {{ item.name }}
+                  <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
                 </el-button>
               </template>
             </el-table-column>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 7c3efa3..105dc2e 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -111,4 +111,5 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
diff --git a/src/views/measure/train/components/listApproval.vue b/src/views/measure/train/components/listApproval.vue
index b0b2dd5..d1c4309 100644
--- a/src/views/measure/train/components/listApproval.vue
+++ b/src/views/measure/train/components/listApproval.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup name="ListApproval">
 import type { PropType, Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '@views/measure/source/list_interface'
 import type { IOptions } from '../plan_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
 import { getApprovalDelete, getDeptTree, getListSubmit, getapprovalList } from '@/api/system/plan'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
@@ -19,10 +21,11 @@
   },
 })
 const emit = defineEmits(['setData']) // 关闭
-
+// 获取权限
+const { proxy } = getCurrentInstance() as any
 // 操作列宽度-计算属性
 const operationWidth = computed(() => {
-  return props.buttons.length * 32 + 24
+  return props.buttons.length * 40 + 24
 })
 
 // 查询条件
@@ -357,15 +360,26 @@
     fetchData(false)
   },
   { immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方列表', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '培训计划审批列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '培训计划审批列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
 </script>
 
 <template>
@@ -426,8 +440,8 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-        <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/train/plan/approve/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
       </template>
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
@@ -439,11 +453,11 @@
               <el-button
                 v-for="(item, index) in buttons"
                 :key="index"
-                size="small"
-                :type="item.type" link
+                size="small" :type="item.type"
+                link
                 @click="clickBtn(row, item.name)"
               >
-                {{ item.name }}
+                <span v-if="item.proxy ? proxy.hasPerm(item.proxy) : true"> {{ item.name }}</span>
               </el-button>
             </template>
           </el-table-column>
diff --git a/src/views/measure/train/plan.vue b/src/views/measure/train/plan.vue
index 9adca50..96a4f65 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -4,12 +4,13 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
 import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { exportFile } from '@/utils/exportUtils'
-const listQuery: Ref<IlistQuery> = ref({
+const listQuery = ref({
   createEndTime: '',
   createStartTime: '',
   deptId: '',
@@ -35,21 +36,15 @@
 const loadingTable = ref(false)
 // 初始化路由
 // 培训时间数组
-const trainTimeArr = ref([
-  listQuery.value.trainStartTime,
-  listQuery.value.trainEndTime,
-])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([
-  listQuery.value.createStartTime,
-  listQuery.value.createEndTime,
-])
+const createTime = ref('')
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -64,7 +59,7 @@
 fetchData(true)
 const { proxy } = getCurrentInstance() as any
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '计划编号',
     value: 'planNo',
@@ -143,8 +138,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -277,7 +272,7 @@
       <search-area :need-clear="true" @search="searchList" @clear="clearList">
         <search-item>
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -288,7 +283,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index f4fc979..9377a9e 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -6,6 +6,7 @@
 import { exportExcel } from '@/utils/exportXlsx'
 import { exportLogList, getDeptTree, getLogList } from '@/api/system/plan'
 import { printJSON } from '@/utils/printUtils'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportFile } from '@/utils/exportUtils'
 const listQuery = ref({
   createEndTime: '',
@@ -27,17 +28,17 @@
 // 主管部门下拉框
 const options = ref([])
 // 培训时间数组
-const trainTimeArr = ref([])
+const trainTime = ref('')
 // 创建时间数组
-const createTimeArr = ref([])
+const createTime = ref('')
 const loadingTable = ref(false)
 // 初始化路由
 const $router = useRouter()
 const fetchData = (isNowPage: boolean) => {
-  listQuery.value.trainStartTime = trainTimeArr.value[0] || ''
-  listQuery.value.trainEndTime = trainTimeArr.value[1] || ''
-  listQuery.value.createStartTime = createTimeArr.value[0] || ''
-  listQuery.value.createEndTime = createTimeArr.value[0] || ''
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  listQuery.value.createStartTime = createTime.value[0] || ''
+  listQuery.value.createEndTime = createTime.value[0] || ''
   loadingTable.value = true
   if (!isNowPage) {
     // 是否显示当前页，否则跳转第一页
@@ -52,7 +53,7 @@
 fetchData(true)
 
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '记录编号',
     value: 'logNo',
@@ -119,8 +120,8 @@
     offset: 1,
     limit: 20,
   }
-  trainTimeArr.value = []
-  createTimeArr.value = []
+  trainTime.value = ''
+  createTime.value = ''
 }
 // 导出
 const exportExcelBtn = () => {
@@ -239,7 +240,7 @@
             value-format="YYYY-MM-DD h:m:s"
           /> -->
           <el-date-picker
-            v-model="trainTimeArr"
+            v-model="trainTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
@@ -250,7 +251,7 @@
         </search-item>
         <search-item>
           <el-date-picker
-            v-model="createTimeArr"
+            v-model="createTime"
             type="datetimerange"
             range-separator="到"
             format="YYYY/MM/DD HH:mm:ss"
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index e060a8b..2421142 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -9,6 +9,7 @@
   name: string
   type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   permission?: string
+  proxy?: string
 }
 const dictStore = useDictStore()
 const buttonsSet: { [key: string]: IButton[] } = {
@@ -17,35 +18,35 @@
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
     { name: '取消', type: 'info' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   草稿箱: [
     { name: '查看', type: 'primary' },
-    { name: '编辑', type: 'primary' },
+    { name: '编辑', type: 'primary', proxy: '/train/plan/approve/edit' },
     { name: '提交', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   待审批: [
     { name: '查看', type: 'primary' },
     { name: '同意', type: 'primary' },
     { name: '驳回', type: 'primary' },
     { name: '拒绝', type: 'danger' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   审批中: [
     { name: '查看', type: 'primary' },
   ],
   已通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   未通过: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
   已取消: [
     { name: '查看', type: 'primary' },
-    { name: '删除', type: 'danger' },
+    { name: '删除', type: 'danger', proxy: '/train/plan/approve/delete' },
   ],
 
 }