diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index e0c98f7..a58f41e 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -25,31 +25,6 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig: any) {
-    // let tempValue = '会签'
-    // let strPeople = ' '
-    // if (nodeConfig.selectCustomApprovalType === 'huoqian') {
-    //   tempValue = '或签'
-    // }
-    // if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-    // else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
-    //   let strPeople = ' '
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责(逐级审批)`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（逐级审批-${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-
     if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
       if (nodeConfig.nodeUserList.length == 1) {
         return nodeConfig.nodeUserList[0].name
@@ -83,7 +58,7 @@
     const arr = []
     const list = str.split(',')
     for (var elem in obj) {
-      list.map((item) => {
+      list.map((item: any) => {
         if (item == elem) {
           arr.push(obj[elem].value)
         }
@@ -118,11 +93,6 @@
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
-    // else {
-    //   if (nodeConfig.ccSelfSelectFlag == 1) {
-    //     return '发起人自选'
-    //   }
-    // }
   },
   toggleStrClass(item: any, key: any) {
     const a = item.zdy1 ? item.zdy1.split(',') : []

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index e0c98f7..a58f41e 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -25,31 +25,6 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig: any) {
-    // let tempValue = '会签'
-    // let strPeople = ' '
-    // if (nodeConfig.selectCustomApprovalType === 'huoqian') {
-    //   tempValue = '或签'
-    // }
-    // if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-    // else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
-    //   let strPeople = ' '
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责(逐级审批)`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（逐级审批-${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-
     if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
       if (nodeConfig.nodeUserList.length == 1) {
         return nodeConfig.nodeUserList[0].name
@@ -83,7 +58,7 @@
     const arr = []
     const list = str.split(',')
     for (var elem in obj) {
-      list.map((item) => {
+      list.map((item: any) => {
         if (item == elem) {
           arr.push(obj[elem].value)
         }
@@ -118,11 +93,6 @@
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
-    // else {
-    //   if (nodeConfig.ccSelfSelectFlag == 1) {
-    //     return '发起人自选'
-    //   }
-    // }
   },
   toggleStrClass(item: any, key: any) {
     const a = item.zdy1 ? item.zdy1.split(',') : []
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..734f146 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -13,7 +12,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -300,26 +298,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(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)
-            }
-          })
-        }
-        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)
-            }
-          })
-        }
+        updateSample(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)
+          }
+        })
       })
     }
   })
@@ -604,7 +590,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -614,7 +600,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -625,6 +611,34 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index e0c98f7..a58f41e 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -25,31 +25,6 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig: any) {
-    // let tempValue = '会签'
-    // let strPeople = ' '
-    // if (nodeConfig.selectCustomApprovalType === 'huoqian') {
-    //   tempValue = '或签'
-    // }
-    // if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-    // else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
-    //   let strPeople = ' '
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责(逐级审批)`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（逐级审批-${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-
     if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
       if (nodeConfig.nodeUserList.length == 1) {
         return nodeConfig.nodeUserList[0].name
@@ -83,7 +58,7 @@
     const arr = []
     const list = str.split(',')
     for (var elem in obj) {
-      list.map((item) => {
+      list.map((item: any) => {
         if (item == elem) {
           arr.push(obj[elem].value)
         }
@@ -118,11 +93,6 @@
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
-    // else {
-    //   if (nodeConfig.ccSelfSelectFlag == 1) {
-    //     return '发起人自选'
-    //   }
-    // }
   },
   toggleStrClass(item: any, key: any) {
     const a = item.zdy1 ? item.zdy1.split(',') : []
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..734f146 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -13,7 +12,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -300,26 +298,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(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)
-            }
-          })
-        }
-        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)
-            }
-          })
-        }
+        updateSample(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)
+          }
+        })
       })
     }
   })
@@ -604,7 +590,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -614,7 +600,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -625,6 +611,34 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 74e0a67..759e08a 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -16,8 +16,9 @@
   interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
-} from '@/api/business/schedule'
+} from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -64,7 +65,7 @@
   { text: '委托方代码', value: 'customerId', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
@@ -79,7 +80,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'deliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -139,7 +140,7 @@
       customerId: 'test', // 委托方代码
       customerName: 'test', // 委托方名称
       deliverer: 'test', // 送检人
-      isUrgent: '2', // 是否加急
+      isUrgent: '1', // 是否加急
       sampleAttr: '1', // 样品属性
       planDeliverTime: 'test', // 预计送达时间
       deliverTime: 'test', // 实际送达时间
@@ -151,7 +152,6 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
       sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
@@ -452,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="240">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
@@ -496,7 +496,7 @@
                 type="danger"
                 @click="handleEdit(row, 'delete', '删除')"
               >
-                删除
+                无需检测
               </el-button>
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index e0c98f7..a58f41e 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -25,31 +25,6 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig: any) {
-    // let tempValue = '会签'
-    // let strPeople = ' '
-    // if (nodeConfig.selectCustomApprovalType === 'huoqian') {
-    //   tempValue = '或签'
-    // }
-    // if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-    // else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
-    //   let strPeople = ' '
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责(逐级审批)`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（逐级审批-${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-
     if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
       if (nodeConfig.nodeUserList.length == 1) {
         return nodeConfig.nodeUserList[0].name
@@ -83,7 +58,7 @@
     const arr = []
     const list = str.split(',')
     for (var elem in obj) {
-      list.map((item) => {
+      list.map((item: any) => {
         if (item == elem) {
           arr.push(obj[elem].value)
         }
@@ -118,11 +93,6 @@
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
-    // else {
-    //   if (nodeConfig.ccSelfSelectFlag == 1) {
-    //     return '发起人自选'
-    //   }
-    // }
   },
   toggleStrClass(item: any, key: any) {
     const a = item.zdy1 ? item.zdy1.split(',') : []
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..734f146 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -13,7 +12,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -300,26 +298,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(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)
-            }
-          })
-        }
-        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)
-            }
-          })
-        }
+        updateSample(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)
+          }
+        })
       })
     }
   })
@@ -604,7 +590,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -614,7 +600,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -625,6 +611,34 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 74e0a67..759e08a 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -16,8 +16,9 @@
   interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
-} from '@/api/business/schedule'
+} from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -64,7 +65,7 @@
   { text: '委托方代码', value: 'customerId', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
@@ -79,7 +80,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'deliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -139,7 +140,7 @@
       customerId: 'test', // 委托方代码
       customerName: 'test', // 委托方名称
       deliverer: 'test', // 送检人
-      isUrgent: '2', // 是否加急
+      isUrgent: '1', // 是否加急
       sampleAttr: '1', // 样品属性
       planDeliverTime: 'test', // 预计送达时间
       deliverTime: 'test', // 实际送达时间
@@ -151,7 +152,6 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
       sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
@@ -452,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="240">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
@@ -496,7 +496,7 @@
                 type="danger"
                 @click="handleEdit(row, 'delete', '删除')"
               >
-                删除
+                无需检测
               </el-button>
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index e8b9bfc..60c292d 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -1,10 +1,378 @@
 <script lang="ts" setup name="OrderList">
-// 委托书
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IListQuery, IOrderList } from './orderList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
+const { proxy } = getCurrentInstance() as any
+
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  orderCode: '', // 委托书编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  deliverer: '', // 送样人
+  isUrgent: '', // 是否加急
+  status: '', // 接收状态
+  offset: 1,
+  limit: 20,
+})
+// 是否加急
+const isUrgentMap = [
+  { label: '全部', value: '0' },
+  { label: '是', value: '1' },
+  { label: '否', value: '2' },
+]
+// 接收状态
+const statusMap = [
+  { label: '全部', value: '0' },
+  { label: '已接收', value: '1' },
+  { label: '未接收', value: '2' },
+  { label: '已取消', value: '3' },
+]
+
+const columns = ref<TableColumn[]>([
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '样品数量', value: 'sampleQuantity', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '接收状态', value: 'status', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IOrderList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getInterChangeList(listQuery.value).then((response) => {
+  //   response.data.rows = [
+  //     {
+  //       id: 'test',
+  //       sampleNo: 'test', // 样品编号
+  //       sampleName: 'test', // 样品名称
+  //       sampleModel: 'test', // 型号
+  //       evaluationName: 'test', // 出厂编号
+  //       orderCode: 'test', // 委托书编号
+  //       customerId: 'test', // 委托方代码
+  //       customerName: 'test', // 委托方名称
+  //       deliverer: 'test', // 送检人
+  //       isUrgent: 'test', // 是否加急
+  //       sampleAttr: 'test', // 样品属性
+  //       planDeliverTime: 'test', // 预计送达时间
+  //     }]
+  //   list.value = response.data.rows.map((item: IinterchangeList) => {
+  //     return {
+  //       ...item,
+  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+  //     }
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      id: 'test',
+      orderCode: 'test', // 委托书编号
+      customerId: 'test', // 委托方代码
+      customerName: 'test', // 委托方名称
+      deliverer: 'test', // 送检人
+      delivererTel: 'test', // 送样人联系方式
+      sampleQuantity: 40, // 样品数量
+      isUrgent: '1', // 是否加急
+      status: 'test', // 接收状态
+      createTime: 'test', // 创建时间
+      remark: '备注',
+    },
+  ]
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    orderCode: '', // 委托书编号
+    customerId: '', // 委托方代码
+    customerName: '', // 委托方名称
+    deliverer: '', // 送样人
+    isUrgent: '', // 是否加急
+    status: '', // 接收状态
+    offset: 1,
+    limit: 20,
+  }
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IOrderList, type: string, title: string) => {
+  ElMessageBox.confirm(
+    `确认${title}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      if (type === 'receive') { // 接收
+        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+      else if (type === 'back') { // 退回
+        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      orderCode: '', // 委托书编号
+      customerId: '', // 委托方代码
+      customerName: '', // 委托方名称
+      deliverer: '', // 送样人
+      isUrgent: '', // 是否加急
+      status: '', // 接收状态
+      ids: checkoutList.value,
+    }
+    // exportInterchangeList(params).then((res) => {
+    //   const blob = new Blob([res.data])
+    //   exportFile(blob, '委托书列表.xlsx')
+    // })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+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: IOrderList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备收发列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  // todo: 校验文件类型，调用上传接口
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      // const fd = new FormData()
+      // fd.append('multipartFile', event.target.files[0])
+      // uploadApi(fd).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage.success('上传成功')
+      //   }
+      //   else {
+      //     ElMessage.error(res.message)
+      //   }
+      // })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+
+// 点击批量导入
+const uploadAll = () => {
+  fileRef.value.click()
+}
+
+// 点击编辑详情
+const goEdit = (row: IOrderList, type: string) => {
+
+}
+
+fetchData(true)
 </script>
 
 <template>
   <app-container>
-    委托书
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderCode"
+          placeholder="委托书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerId"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.deliverer"
+          placeholder="送样人"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in isUrgentMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in statusMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="170">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="goEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="goEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'receive', '接收')"
+              >
+                接收
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'back', '退回')"
+              >
+                退回
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index e0c98f7..a58f41e 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -25,31 +25,6 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig: any) {
-    // let tempValue = '会签'
-    // let strPeople = ' '
-    // if (nodeConfig.selectCustomApprovalType === 'huoqian') {
-    //   tempValue = '或签'
-    // }
-    // if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-    // else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
-    //   let strPeople = ' '
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责(逐级审批)`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（逐级审批-${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-
     if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
       if (nodeConfig.nodeUserList.length == 1) {
         return nodeConfig.nodeUserList[0].name
@@ -83,7 +58,7 @@
     const arr = []
     const list = str.split(',')
     for (var elem in obj) {
-      list.map((item) => {
+      list.map((item: any) => {
         if (item == elem) {
           arr.push(obj[elem].value)
         }
@@ -118,11 +93,6 @@
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
-    // else {
-    //   if (nodeConfig.ccSelfSelectFlag == 1) {
-    //     return '发起人自选'
-    //   }
-    // }
   },
   toggleStrClass(item: any, key: any) {
     const a = item.zdy1 ? item.zdy1.split(',') : []
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..734f146 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -13,7 +12,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -300,26 +298,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(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)
-            }
-          })
-        }
-        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)
-            }
-          })
-        }
+        updateSample(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)
+          }
+        })
       })
     }
   })
@@ -604,7 +590,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -614,7 +600,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -625,6 +611,34 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 74e0a67..759e08a 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -16,8 +16,9 @@
   interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
-} from '@/api/business/schedule'
+} from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -64,7 +65,7 @@
   { text: '委托方代码', value: 'customerId', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
@@ -79,7 +80,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'deliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -139,7 +140,7 @@
       customerId: 'test', // 委托方代码
       customerName: 'test', // 委托方名称
       deliverer: 'test', // 送检人
-      isUrgent: '2', // 是否加急
+      isUrgent: '1', // 是否加急
       sampleAttr: '1', // 样品属性
       planDeliverTime: 'test', // 预计送达时间
       deliverTime: 'test', // 实际送达时间
@@ -151,7 +152,6 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
       sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
@@ -452,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="240">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
@@ -496,7 +496,7 @@
                 type="danger"
                 @click="handleEdit(row, 'delete', '删除')"
               >
-                删除
+                无需检测
               </el-button>
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index e8b9bfc..60c292d 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -1,10 +1,378 @@
 <script lang="ts" setup name="OrderList">
-// 委托书
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IListQuery, IOrderList } from './orderList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
+const { proxy } = getCurrentInstance() as any
+
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  orderCode: '', // 委托书编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  deliverer: '', // 送样人
+  isUrgent: '', // 是否加急
+  status: '', // 接收状态
+  offset: 1,
+  limit: 20,
+})
+// 是否加急
+const isUrgentMap = [
+  { label: '全部', value: '0' },
+  { label: '是', value: '1' },
+  { label: '否', value: '2' },
+]
+// 接收状态
+const statusMap = [
+  { label: '全部', value: '0' },
+  { label: '已接收', value: '1' },
+  { label: '未接收', value: '2' },
+  { label: '已取消', value: '3' },
+]
+
+const columns = ref<TableColumn[]>([
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '样品数量', value: 'sampleQuantity', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '接收状态', value: 'status', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IOrderList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getInterChangeList(listQuery.value).then((response) => {
+  //   response.data.rows = [
+  //     {
+  //       id: 'test',
+  //       sampleNo: 'test', // 样品编号
+  //       sampleName: 'test', // 样品名称
+  //       sampleModel: 'test', // 型号
+  //       evaluationName: 'test', // 出厂编号
+  //       orderCode: 'test', // 委托书编号
+  //       customerId: 'test', // 委托方代码
+  //       customerName: 'test', // 委托方名称
+  //       deliverer: 'test', // 送检人
+  //       isUrgent: 'test', // 是否加急
+  //       sampleAttr: 'test', // 样品属性
+  //       planDeliverTime: 'test', // 预计送达时间
+  //     }]
+  //   list.value = response.data.rows.map((item: IinterchangeList) => {
+  //     return {
+  //       ...item,
+  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+  //     }
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      id: 'test',
+      orderCode: 'test', // 委托书编号
+      customerId: 'test', // 委托方代码
+      customerName: 'test', // 委托方名称
+      deliverer: 'test', // 送检人
+      delivererTel: 'test', // 送样人联系方式
+      sampleQuantity: 40, // 样品数量
+      isUrgent: '1', // 是否加急
+      status: 'test', // 接收状态
+      createTime: 'test', // 创建时间
+      remark: '备注',
+    },
+  ]
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    orderCode: '', // 委托书编号
+    customerId: '', // 委托方代码
+    customerName: '', // 委托方名称
+    deliverer: '', // 送样人
+    isUrgent: '', // 是否加急
+    status: '', // 接收状态
+    offset: 1,
+    limit: 20,
+  }
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IOrderList, type: string, title: string) => {
+  ElMessageBox.confirm(
+    `确认${title}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      if (type === 'receive') { // 接收
+        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+      else if (type === 'back') { // 退回
+        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      orderCode: '', // 委托书编号
+      customerId: '', // 委托方代码
+      customerName: '', // 委托方名称
+      deliverer: '', // 送样人
+      isUrgent: '', // 是否加急
+      status: '', // 接收状态
+      ids: checkoutList.value,
+    }
+    // exportInterchangeList(params).then((res) => {
+    //   const blob = new Blob([res.data])
+    //   exportFile(blob, '委托书列表.xlsx')
+    // })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+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: IOrderList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备收发列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  // todo: 校验文件类型，调用上传接口
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      // const fd = new FormData()
+      // fd.append('multipartFile', event.target.files[0])
+      // uploadApi(fd).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage.success('上传成功')
+      //   }
+      //   else {
+      //     ElMessage.error(res.message)
+      //   }
+      // })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+
+// 点击批量导入
+const uploadAll = () => {
+  fileRef.value.click()
+}
+
+// 点击编辑详情
+const goEdit = (row: IOrderList, type: string) => {
+
+}
+
+fetchData(true)
 </script>
 
 <template>
   <app-container>
-    委托书
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderCode"
+          placeholder="委托书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerId"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.deliverer"
+          placeholder="送样人"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in isUrgentMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in statusMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="170">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="goEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="goEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'receive', '接收')"
+              >
+                接收
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'back', '退回')"
+              >
+                退回
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
new file mode 100644
index 0000000..1d2c1bd
--- /dev/null
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -0,0 +1,27 @@
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+export interface IListQuery {
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送样人
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  offset: number
+  limit: number
+}
+
+// 表格
+export interface IOrderList {
+  id: string
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  sampleQuantity: number | string // 样品数量
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  createTime: string // 创建时间
+  remark: string // 备注
+}

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index e0c98f7..a58f41e 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -25,31 +25,6 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig: any) {
-    // let tempValue = '会签'
-    // let strPeople = ' '
-    // if (nodeConfig.selectCustomApprovalType === 'huoqian') {
-    //   tempValue = '或签'
-    // }
-    // if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-    // else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
-    //   let strPeople = ' '
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责(逐级审批)`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（逐级审批-${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-
     if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
       if (nodeConfig.nodeUserList.length == 1) {
         return nodeConfig.nodeUserList[0].name
@@ -83,7 +58,7 @@
     const arr = []
     const list = str.split(',')
     for (var elem in obj) {
-      list.map((item) => {
+      list.map((item: any) => {
         if (item == elem) {
           arr.push(obj[elem].value)
         }
@@ -118,11 +93,6 @@
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
-    // else {
-    //   if (nodeConfig.ccSelfSelectFlag == 1) {
-    //     return '发起人自选'
-    //   }
-    // }
   },
   toggleStrClass(item: any, key: any) {
     const a = item.zdy1 ? item.zdy1.split(',') : []
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..734f146 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -13,7 +12,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -300,26 +298,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(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)
-            }
-          })
-        }
-        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)
-            }
-          })
-        }
+        updateSample(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)
+          }
+        })
       })
     }
   })
@@ -604,7 +590,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -614,7 +600,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -625,6 +611,34 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 74e0a67..759e08a 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -16,8 +16,9 @@
   interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
-} from '@/api/business/schedule'
+} from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -64,7 +65,7 @@
   { text: '委托方代码', value: 'customerId', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
@@ -79,7 +80,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'deliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -139,7 +140,7 @@
       customerId: 'test', // 委托方代码
       customerName: 'test', // 委托方名称
       deliverer: 'test', // 送检人
-      isUrgent: '2', // 是否加急
+      isUrgent: '1', // 是否加急
       sampleAttr: '1', // 样品属性
       planDeliverTime: 'test', // 预计送达时间
       deliverTime: 'test', // 实际送达时间
@@ -151,7 +152,6 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
       sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
@@ -452,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="240">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
@@ -496,7 +496,7 @@
                 type="danger"
                 @click="handleEdit(row, 'delete', '删除')"
               >
-                删除
+                无需检测
               </el-button>
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index e8b9bfc..60c292d 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -1,10 +1,378 @@
 <script lang="ts" setup name="OrderList">
-// 委托书
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IListQuery, IOrderList } from './orderList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
+const { proxy } = getCurrentInstance() as any
+
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  orderCode: '', // 委托书编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  deliverer: '', // 送样人
+  isUrgent: '', // 是否加急
+  status: '', // 接收状态
+  offset: 1,
+  limit: 20,
+})
+// 是否加急
+const isUrgentMap = [
+  { label: '全部', value: '0' },
+  { label: '是', value: '1' },
+  { label: '否', value: '2' },
+]
+// 接收状态
+const statusMap = [
+  { label: '全部', value: '0' },
+  { label: '已接收', value: '1' },
+  { label: '未接收', value: '2' },
+  { label: '已取消', value: '3' },
+]
+
+const columns = ref<TableColumn[]>([
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '样品数量', value: 'sampleQuantity', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '接收状态', value: 'status', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IOrderList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getInterChangeList(listQuery.value).then((response) => {
+  //   response.data.rows = [
+  //     {
+  //       id: 'test',
+  //       sampleNo: 'test', // 样品编号
+  //       sampleName: 'test', // 样品名称
+  //       sampleModel: 'test', // 型号
+  //       evaluationName: 'test', // 出厂编号
+  //       orderCode: 'test', // 委托书编号
+  //       customerId: 'test', // 委托方代码
+  //       customerName: 'test', // 委托方名称
+  //       deliverer: 'test', // 送检人
+  //       isUrgent: 'test', // 是否加急
+  //       sampleAttr: 'test', // 样品属性
+  //       planDeliverTime: 'test', // 预计送达时间
+  //     }]
+  //   list.value = response.data.rows.map((item: IinterchangeList) => {
+  //     return {
+  //       ...item,
+  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+  //     }
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      id: 'test',
+      orderCode: 'test', // 委托书编号
+      customerId: 'test', // 委托方代码
+      customerName: 'test', // 委托方名称
+      deliverer: 'test', // 送检人
+      delivererTel: 'test', // 送样人联系方式
+      sampleQuantity: 40, // 样品数量
+      isUrgent: '1', // 是否加急
+      status: 'test', // 接收状态
+      createTime: 'test', // 创建时间
+      remark: '备注',
+    },
+  ]
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    orderCode: '', // 委托书编号
+    customerId: '', // 委托方代码
+    customerName: '', // 委托方名称
+    deliverer: '', // 送样人
+    isUrgent: '', // 是否加急
+    status: '', // 接收状态
+    offset: 1,
+    limit: 20,
+  }
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IOrderList, type: string, title: string) => {
+  ElMessageBox.confirm(
+    `确认${title}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      if (type === 'receive') { // 接收
+        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+      else if (type === 'back') { // 退回
+        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      orderCode: '', // 委托书编号
+      customerId: '', // 委托方代码
+      customerName: '', // 委托方名称
+      deliverer: '', // 送样人
+      isUrgent: '', // 是否加急
+      status: '', // 接收状态
+      ids: checkoutList.value,
+    }
+    // exportInterchangeList(params).then((res) => {
+    //   const blob = new Blob([res.data])
+    //   exportFile(blob, '委托书列表.xlsx')
+    // })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+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: IOrderList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备收发列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  // todo: 校验文件类型，调用上传接口
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      // const fd = new FormData()
+      // fd.append('multipartFile', event.target.files[0])
+      // uploadApi(fd).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage.success('上传成功')
+      //   }
+      //   else {
+      //     ElMessage.error(res.message)
+      //   }
+      // })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+
+// 点击批量导入
+const uploadAll = () => {
+  fileRef.value.click()
+}
+
+// 点击编辑详情
+const goEdit = (row: IOrderList, type: string) => {
+
+}
+
+fetchData(true)
 </script>
 
 <template>
   <app-container>
-    委托书
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderCode"
+          placeholder="委托书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerId"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.deliverer"
+          placeholder="送样人"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in isUrgentMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in statusMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="170">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="goEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="goEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'receive', '接收')"
+              >
+                接收
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'back', '退回')"
+              >
+                退回
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
new file mode 100644
index 0000000..1d2c1bd
--- /dev/null
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -0,0 +1,27 @@
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+export interface IListQuery {
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送样人
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  offset: number
+  limit: number
+}
+
+// 表格
+export interface IOrderList {
+  id: string
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  sampleQuantity: number | string // 样品数量
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  createTime: string // 创建时间
+  remark: string // 备注
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 153b66e..c27e136 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,7 +13,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -603,7 +602,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -613,7 +612,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -623,6 +622,34 @@
                 />
               </el-form-item>
             </el-col>
+            <!-- <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index e0c98f7..a58f41e 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -25,31 +25,6 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig: any) {
-    // let tempValue = '会签'
-    // let strPeople = ' '
-    // if (nodeConfig.selectCustomApprovalType === 'huoqian') {
-    //   tempValue = '或签'
-    // }
-    // if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-    // else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
-    //   let strPeople = ' '
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责(逐级审批)`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（逐级审批-${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-
     if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
       if (nodeConfig.nodeUserList.length == 1) {
         return nodeConfig.nodeUserList[0].name
@@ -83,7 +58,7 @@
     const arr = []
     const list = str.split(',')
     for (var elem in obj) {
-      list.map((item) => {
+      list.map((item: any) => {
         if (item == elem) {
           arr.push(obj[elem].value)
         }
@@ -118,11 +93,6 @@
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
-    // else {
-    //   if (nodeConfig.ccSelfSelectFlag == 1) {
-    //     return '发起人自选'
-    //   }
-    // }
   },
   toggleStrClass(item: any, key: any) {
     const a = item.zdy1 ? item.zdy1.split(',') : []
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..734f146 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -13,7 +12,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -300,26 +298,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(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)
-            }
-          })
-        }
-        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)
-            }
-          })
-        }
+        updateSample(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)
+          }
+        })
       })
     }
   })
@@ -604,7 +590,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -614,7 +600,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -625,6 +611,34 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 74e0a67..759e08a 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -16,8 +16,9 @@
   interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
-} from '@/api/business/schedule'
+} from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -64,7 +65,7 @@
   { text: '委托方代码', value: 'customerId', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
@@ -79,7 +80,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'deliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -139,7 +140,7 @@
       customerId: 'test', // 委托方代码
       customerName: 'test', // 委托方名称
       deliverer: 'test', // 送检人
-      isUrgent: '2', // 是否加急
+      isUrgent: '1', // 是否加急
       sampleAttr: '1', // 样品属性
       planDeliverTime: 'test', // 预计送达时间
       deliverTime: 'test', // 实际送达时间
@@ -151,7 +152,6 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
       sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
@@ -452,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="240">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
@@ -496,7 +496,7 @@
                 type="danger"
                 @click="handleEdit(row, 'delete', '删除')"
               >
-                删除
+                无需检测
               </el-button>
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index e8b9bfc..60c292d 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -1,10 +1,378 @@
 <script lang="ts" setup name="OrderList">
-// 委托书
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IListQuery, IOrderList } from './orderList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
+const { proxy } = getCurrentInstance() as any
+
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  orderCode: '', // 委托书编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  deliverer: '', // 送样人
+  isUrgent: '', // 是否加急
+  status: '', // 接收状态
+  offset: 1,
+  limit: 20,
+})
+// 是否加急
+const isUrgentMap = [
+  { label: '全部', value: '0' },
+  { label: '是', value: '1' },
+  { label: '否', value: '2' },
+]
+// 接收状态
+const statusMap = [
+  { label: '全部', value: '0' },
+  { label: '已接收', value: '1' },
+  { label: '未接收', value: '2' },
+  { label: '已取消', value: '3' },
+]
+
+const columns = ref<TableColumn[]>([
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '样品数量', value: 'sampleQuantity', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '接收状态', value: 'status', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IOrderList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getInterChangeList(listQuery.value).then((response) => {
+  //   response.data.rows = [
+  //     {
+  //       id: 'test',
+  //       sampleNo: 'test', // 样品编号
+  //       sampleName: 'test', // 样品名称
+  //       sampleModel: 'test', // 型号
+  //       evaluationName: 'test', // 出厂编号
+  //       orderCode: 'test', // 委托书编号
+  //       customerId: 'test', // 委托方代码
+  //       customerName: 'test', // 委托方名称
+  //       deliverer: 'test', // 送检人
+  //       isUrgent: 'test', // 是否加急
+  //       sampleAttr: 'test', // 样品属性
+  //       planDeliverTime: 'test', // 预计送达时间
+  //     }]
+  //   list.value = response.data.rows.map((item: IinterchangeList) => {
+  //     return {
+  //       ...item,
+  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+  //     }
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      id: 'test',
+      orderCode: 'test', // 委托书编号
+      customerId: 'test', // 委托方代码
+      customerName: 'test', // 委托方名称
+      deliverer: 'test', // 送检人
+      delivererTel: 'test', // 送样人联系方式
+      sampleQuantity: 40, // 样品数量
+      isUrgent: '1', // 是否加急
+      status: 'test', // 接收状态
+      createTime: 'test', // 创建时间
+      remark: '备注',
+    },
+  ]
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    orderCode: '', // 委托书编号
+    customerId: '', // 委托方代码
+    customerName: '', // 委托方名称
+    deliverer: '', // 送样人
+    isUrgent: '', // 是否加急
+    status: '', // 接收状态
+    offset: 1,
+    limit: 20,
+  }
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IOrderList, type: string, title: string) => {
+  ElMessageBox.confirm(
+    `确认${title}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      if (type === 'receive') { // 接收
+        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+      else if (type === 'back') { // 退回
+        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      orderCode: '', // 委托书编号
+      customerId: '', // 委托方代码
+      customerName: '', // 委托方名称
+      deliverer: '', // 送样人
+      isUrgent: '', // 是否加急
+      status: '', // 接收状态
+      ids: checkoutList.value,
+    }
+    // exportInterchangeList(params).then((res) => {
+    //   const blob = new Blob([res.data])
+    //   exportFile(blob, '委托书列表.xlsx')
+    // })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+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: IOrderList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备收发列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  // todo: 校验文件类型，调用上传接口
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      // const fd = new FormData()
+      // fd.append('multipartFile', event.target.files[0])
+      // uploadApi(fd).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage.success('上传成功')
+      //   }
+      //   else {
+      //     ElMessage.error(res.message)
+      //   }
+      // })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+
+// 点击批量导入
+const uploadAll = () => {
+  fileRef.value.click()
+}
+
+// 点击编辑详情
+const goEdit = (row: IOrderList, type: string) => {
+
+}
+
+fetchData(true)
 </script>
 
 <template>
   <app-container>
-    委托书
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderCode"
+          placeholder="委托书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerId"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.deliverer"
+          placeholder="送样人"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in isUrgentMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in statusMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="170">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="goEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="goEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'receive', '接收')"
+              >
+                接收
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'back', '退回')"
+              >
+                退回
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
new file mode 100644
index 0000000..1d2c1bd
--- /dev/null
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -0,0 +1,27 @@
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+export interface IListQuery {
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送样人
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  offset: number
+  limit: number
+}
+
+// 表格
+export interface IOrderList {
+  id: string
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  sampleQuantity: number | string // 样品数量
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  createTime: string // 创建时间
+  remark: string // 备注
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 153b66e..c27e136 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,7 +13,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -603,7 +602,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -613,7 +612,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -623,6 +622,34 @@
                 />
               </el-form-item>
             </el-col>
+            <!-- <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 577779f..aa181ed 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -1,15 +1,14 @@
-<script setup lang="ts" name="ProcessSetting">
+<script setup lang="ts" name="Setting">
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineExpose, nextTick, onMounted, ref } from 'vue'
-import { useRoute } from 'vue-router'
 import useWorkFlowStore from '@/store/modules/workFlow'
 import errorDialog from '@/components/dialog/errorDialog.vue'
 import approverDrawer from '@/components/drawer/approverDrawer.vue'
 import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
 import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
-import { addProcess, editProcess, getDirectorLevel, getProcessDetail, unloadProcess } from '@/api/system/process'
+import { addProcess, editProcess, getDirectorLevel, getProcessDetail } from '@/api/system/process'
 import userStore from '@/store/modules/user'
-import type { ITipList } from '@/views/system/process/process'
+import type { ITipList, IworkFlowDef } from '@/views/system/process/process'
 const props = defineProps({
   allowEditNode: {
     type: Boolean,
@@ -30,14 +29,17 @@
 
 const user = userStore()
 const workFlowStore = useWorkFlowStore()
-const router = useRouter()
 const tipList = ref<ITipList[]>([]) // 统计空节点的数组
 const tipVisible = ref(false) // 控制提示空节点对话框显隐
 const nowVal = ref(100)
 const nodeConfig = ref({})
-const workFlowDef = ref({})
+const workFlowDef = ref<IworkFlowDef>({
+  name: '审批流程',
+})
 const flowPermission = ref([])
 const directorMaxLevel = ref(0)
+
+// 初始化--请求流程图详细信息
 const initDetail = async (formid: string) => {
   const res = await getProcessDetail(formid)
   return res.data
@@ -49,7 +51,7 @@
   getDirectorLevel(user.id).then((res) => {
     max = res.data.level
   })
-  const route = useRoute()
+  window.sessionStorage.setItem('maxLevel', `${max}`)
   nextTick(async () => {
     let data
     if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
@@ -59,7 +61,7 @@
       data = {
         tableId: 1,
         workFlowDef: {
-          name: '合同审批',
+          name: '审批流程',
         },
         directorMaxLevel: max,
         flowPermission: [],
@@ -81,19 +83,19 @@
         },
       }
     }
-    processConfig.value = data
+    processConfig.value = data // 流程设置
     const {
-      nodeConfig: nodes,
+      nodeConfig: nodes, // 节点设置
       flowPermission: flows, // 发起人
-      // directorMaxLevel: directors,
-      workFlowDef: works,
+      workFlowDef: works, // 流程基本信息
       tableId,
     } = data
-    nodeConfig.value = nodes
-    flowPermission.value = flows
-    // directorMaxLevel.value = directors
-    directorMaxLevel.value = max
-    workFlowDef.value = works
+    nodeConfig.value = nodes // 节点配置
+    flowPermission.value = flows // 发起人
+    directorMaxLevel.value = max // 用户主管最大层级数
+    workFlowDef.value = works // 流程基本信息
+    window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
+    window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
     workFlowStore.setTableId(tableId)
   })
 })
@@ -132,13 +134,12 @@
 // 保存流程图
 const saveSet = async () => {
   if (!props.isAddProcess) { // 编辑
-    processConfig.value.formId = props.getRowData.formId
+    processConfig.value.formId = props.getRowData.formId // 已有formid
     processConfig.value.formName = props.getRowData.formName
     processConfig.value.formDesc = props.getRowData.formDesc
     processConfig.value.formContent = props.getRowData.formDesc
     processConfig.value.workFlowDef.flowKey = props.getRowData.flowKey
     processConfig.value.workFlowDef.directorId = props.getRowData.directorId
-    processConfig.value.workFlowDef.name = props.getRowData.name
   }
   else { // 新建
     processConfig.value.formId = props.getRowData.formID
@@ -146,7 +147,15 @@
     processConfig.value.formDesc = props.getRowData.desc
     processConfig.value.formContent = props.getRowData.desc
     processConfig.value.workFlowDef.directorId = user.id
-    processConfig.value.workFlowDef.name = props.getRowData.name
+  }
+  processConfig.value.workFlowDef.name = props.getRowData.name // 流程名称
+  const decisionItem = window.sessionStorage.getItem('decisionItem')
+  const noticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (decisionItem) {
+    processConfig.value.workFlowDef.decisionItem = parseInt(decisionItem) // 可选决策项
+  }
+  if (noticeStarter) {
+    processConfig.value.workFlowDef.noticeStarter = parseInt(noticeStarter) // 审批结果通知发起人
   }
 
   workFlowStore.setIsTried(true)
@@ -163,9 +172,9 @@
         conditonCount += 1
       }
     })
-    workFlowStore.conditonErrorCount = conditonCount
-    workFlowStore.approverErrorCount = approverCount
-    tipVisible.value = true
+    workFlowStore.conditonErrorCount = conditonCount // 存入store
+    workFlowStore.approverErrorCount = approverCount // 存入store
+    tipVisible.value = true // 显示空节点提示框
     return
   }
 
@@ -188,11 +197,12 @@
       type: 1, // 成员
     }
 
-    const res = await addProcess(processConfig.value)
-    if (res.code == 200) {
+    addProcess(processConfig.value).then(() => {
       ElMessage.success('创建流程成功')
-      emits('createProcessSuccess')
-    }
+      emits('createProcessSuccess') // 返回列表页
+    }).catch(() => { // 流程异常情况: 所填写的formID已经存在
+      emits('createProcessSuccess') // 返回列表页
+    })
   }
   loading.close()
 }

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index e0c98f7..a58f41e 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -25,31 +25,6 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig: any) {
-    // let tempValue = '会签'
-    // let strPeople = ' '
-    // if (nodeConfig.selectCustomApprovalType === 'huoqian') {
-    //   tempValue = '或签'
-    // }
-    // if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-    // else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
-    //   let strPeople = ' '
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责(逐级审批)`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（逐级审批-${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-
     if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
       if (nodeConfig.nodeUserList.length == 1) {
         return nodeConfig.nodeUserList[0].name
@@ -83,7 +58,7 @@
     const arr = []
     const list = str.split(',')
     for (var elem in obj) {
-      list.map((item) => {
+      list.map((item: any) => {
         if (item == elem) {
           arr.push(obj[elem].value)
         }
@@ -118,11 +93,6 @@
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
-    // else {
-    //   if (nodeConfig.ccSelfSelectFlag == 1) {
-    //     return '发起人自选'
-    //   }
-    // }
   },
   toggleStrClass(item: any, key: any) {
     const a = item.zdy1 ? item.zdy1.split(',') : []
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..734f146 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -13,7 +12,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -300,26 +298,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(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)
-            }
-          })
-        }
-        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)
-            }
-          })
-        }
+        updateSample(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)
+          }
+        })
       })
     }
   })
@@ -604,7 +590,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -614,7 +600,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -625,6 +611,34 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 74e0a67..759e08a 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -16,8 +16,9 @@
   interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
-} from '@/api/business/schedule'
+} from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -64,7 +65,7 @@
   { text: '委托方代码', value: 'customerId', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
@@ -79,7 +80,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'deliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -139,7 +140,7 @@
       customerId: 'test', // 委托方代码
       customerName: 'test', // 委托方名称
       deliverer: 'test', // 送检人
-      isUrgent: '2', // 是否加急
+      isUrgent: '1', // 是否加急
       sampleAttr: '1', // 样品属性
       planDeliverTime: 'test', // 预计送达时间
       deliverTime: 'test', // 实际送达时间
@@ -151,7 +152,6 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
       sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
@@ -452,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="240">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
@@ -496,7 +496,7 @@
                 type="danger"
                 @click="handleEdit(row, 'delete', '删除')"
               >
-                删除
+                无需检测
               </el-button>
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index e8b9bfc..60c292d 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -1,10 +1,378 @@
 <script lang="ts" setup name="OrderList">
-// 委托书
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IListQuery, IOrderList } from './orderList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
+const { proxy } = getCurrentInstance() as any
+
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  orderCode: '', // 委托书编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  deliverer: '', // 送样人
+  isUrgent: '', // 是否加急
+  status: '', // 接收状态
+  offset: 1,
+  limit: 20,
+})
+// 是否加急
+const isUrgentMap = [
+  { label: '全部', value: '0' },
+  { label: '是', value: '1' },
+  { label: '否', value: '2' },
+]
+// 接收状态
+const statusMap = [
+  { label: '全部', value: '0' },
+  { label: '已接收', value: '1' },
+  { label: '未接收', value: '2' },
+  { label: '已取消', value: '3' },
+]
+
+const columns = ref<TableColumn[]>([
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '样品数量', value: 'sampleQuantity', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '接收状态', value: 'status', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IOrderList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getInterChangeList(listQuery.value).then((response) => {
+  //   response.data.rows = [
+  //     {
+  //       id: 'test',
+  //       sampleNo: 'test', // 样品编号
+  //       sampleName: 'test', // 样品名称
+  //       sampleModel: 'test', // 型号
+  //       evaluationName: 'test', // 出厂编号
+  //       orderCode: 'test', // 委托书编号
+  //       customerId: 'test', // 委托方代码
+  //       customerName: 'test', // 委托方名称
+  //       deliverer: 'test', // 送检人
+  //       isUrgent: 'test', // 是否加急
+  //       sampleAttr: 'test', // 样品属性
+  //       planDeliverTime: 'test', // 预计送达时间
+  //     }]
+  //   list.value = response.data.rows.map((item: IinterchangeList) => {
+  //     return {
+  //       ...item,
+  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+  //     }
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      id: 'test',
+      orderCode: 'test', // 委托书编号
+      customerId: 'test', // 委托方代码
+      customerName: 'test', // 委托方名称
+      deliverer: 'test', // 送检人
+      delivererTel: 'test', // 送样人联系方式
+      sampleQuantity: 40, // 样品数量
+      isUrgent: '1', // 是否加急
+      status: 'test', // 接收状态
+      createTime: 'test', // 创建时间
+      remark: '备注',
+    },
+  ]
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    orderCode: '', // 委托书编号
+    customerId: '', // 委托方代码
+    customerName: '', // 委托方名称
+    deliverer: '', // 送样人
+    isUrgent: '', // 是否加急
+    status: '', // 接收状态
+    offset: 1,
+    limit: 20,
+  }
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IOrderList, type: string, title: string) => {
+  ElMessageBox.confirm(
+    `确认${title}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      if (type === 'receive') { // 接收
+        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+      else if (type === 'back') { // 退回
+        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      orderCode: '', // 委托书编号
+      customerId: '', // 委托方代码
+      customerName: '', // 委托方名称
+      deliverer: '', // 送样人
+      isUrgent: '', // 是否加急
+      status: '', // 接收状态
+      ids: checkoutList.value,
+    }
+    // exportInterchangeList(params).then((res) => {
+    //   const blob = new Blob([res.data])
+    //   exportFile(blob, '委托书列表.xlsx')
+    // })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+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: IOrderList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备收发列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  // todo: 校验文件类型，调用上传接口
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      // const fd = new FormData()
+      // fd.append('multipartFile', event.target.files[0])
+      // uploadApi(fd).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage.success('上传成功')
+      //   }
+      //   else {
+      //     ElMessage.error(res.message)
+      //   }
+      // })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+
+// 点击批量导入
+const uploadAll = () => {
+  fileRef.value.click()
+}
+
+// 点击编辑详情
+const goEdit = (row: IOrderList, type: string) => {
+
+}
+
+fetchData(true)
 </script>
 
 <template>
   <app-container>
-    委托书
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderCode"
+          placeholder="委托书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerId"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.deliverer"
+          placeholder="送样人"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in isUrgentMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in statusMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="170">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="goEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="goEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'receive', '接收')"
+              >
+                接收
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'back', '退回')"
+              >
+                退回
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
new file mode 100644
index 0000000..1d2c1bd
--- /dev/null
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -0,0 +1,27 @@
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+export interface IListQuery {
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送样人
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  offset: number
+  limit: number
+}
+
+// 表格
+export interface IOrderList {
+  id: string
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  sampleQuantity: number | string // 样品数量
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  createTime: string // 创建时间
+  remark: string // 备注
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 153b66e..c27e136 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,7 +13,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -603,7 +602,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -613,7 +612,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -623,6 +622,34 @@
                 />
               </el-form-item>
             </el-col>
+            <!-- <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 577779f..aa181ed 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -1,15 +1,14 @@
-<script setup lang="ts" name="ProcessSetting">
+<script setup lang="ts" name="Setting">
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineExpose, nextTick, onMounted, ref } from 'vue'
-import { useRoute } from 'vue-router'
 import useWorkFlowStore from '@/store/modules/workFlow'
 import errorDialog from '@/components/dialog/errorDialog.vue'
 import approverDrawer from '@/components/drawer/approverDrawer.vue'
 import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
 import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
-import { addProcess, editProcess, getDirectorLevel, getProcessDetail, unloadProcess } from '@/api/system/process'
+import { addProcess, editProcess, getDirectorLevel, getProcessDetail } from '@/api/system/process'
 import userStore from '@/store/modules/user'
-import type { ITipList } from '@/views/system/process/process'
+import type { ITipList, IworkFlowDef } from '@/views/system/process/process'
 const props = defineProps({
   allowEditNode: {
     type: Boolean,
@@ -30,14 +29,17 @@
 
 const user = userStore()
 const workFlowStore = useWorkFlowStore()
-const router = useRouter()
 const tipList = ref<ITipList[]>([]) // 统计空节点的数组
 const tipVisible = ref(false) // 控制提示空节点对话框显隐
 const nowVal = ref(100)
 const nodeConfig = ref({})
-const workFlowDef = ref({})
+const workFlowDef = ref<IworkFlowDef>({
+  name: '审批流程',
+})
 const flowPermission = ref([])
 const directorMaxLevel = ref(0)
+
+// 初始化--请求流程图详细信息
 const initDetail = async (formid: string) => {
   const res = await getProcessDetail(formid)
   return res.data
@@ -49,7 +51,7 @@
   getDirectorLevel(user.id).then((res) => {
     max = res.data.level
   })
-  const route = useRoute()
+  window.sessionStorage.setItem('maxLevel', `${max}`)
   nextTick(async () => {
     let data
     if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
@@ -59,7 +61,7 @@
       data = {
         tableId: 1,
         workFlowDef: {
-          name: '合同审批',
+          name: '审批流程',
         },
         directorMaxLevel: max,
         flowPermission: [],
@@ -81,19 +83,19 @@
         },
       }
     }
-    processConfig.value = data
+    processConfig.value = data // 流程设置
     const {
-      nodeConfig: nodes,
+      nodeConfig: nodes, // 节点设置
       flowPermission: flows, // 发起人
-      // directorMaxLevel: directors,
-      workFlowDef: works,
+      workFlowDef: works, // 流程基本信息
       tableId,
     } = data
-    nodeConfig.value = nodes
-    flowPermission.value = flows
-    // directorMaxLevel.value = directors
-    directorMaxLevel.value = max
-    workFlowDef.value = works
+    nodeConfig.value = nodes // 节点配置
+    flowPermission.value = flows // 发起人
+    directorMaxLevel.value = max // 用户主管最大层级数
+    workFlowDef.value = works // 流程基本信息
+    window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
+    window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
     workFlowStore.setTableId(tableId)
   })
 })
@@ -132,13 +134,12 @@
 // 保存流程图
 const saveSet = async () => {
   if (!props.isAddProcess) { // 编辑
-    processConfig.value.formId = props.getRowData.formId
+    processConfig.value.formId = props.getRowData.formId // 已有formid
     processConfig.value.formName = props.getRowData.formName
     processConfig.value.formDesc = props.getRowData.formDesc
     processConfig.value.formContent = props.getRowData.formDesc
     processConfig.value.workFlowDef.flowKey = props.getRowData.flowKey
     processConfig.value.workFlowDef.directorId = props.getRowData.directorId
-    processConfig.value.workFlowDef.name = props.getRowData.name
   }
   else { // 新建
     processConfig.value.formId = props.getRowData.formID
@@ -146,7 +147,15 @@
     processConfig.value.formDesc = props.getRowData.desc
     processConfig.value.formContent = props.getRowData.desc
     processConfig.value.workFlowDef.directorId = user.id
-    processConfig.value.workFlowDef.name = props.getRowData.name
+  }
+  processConfig.value.workFlowDef.name = props.getRowData.name // 流程名称
+  const decisionItem = window.sessionStorage.getItem('decisionItem')
+  const noticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (decisionItem) {
+    processConfig.value.workFlowDef.decisionItem = parseInt(decisionItem) // 可选决策项
+  }
+  if (noticeStarter) {
+    processConfig.value.workFlowDef.noticeStarter = parseInt(noticeStarter) // 审批结果通知发起人
   }
 
   workFlowStore.setIsTried(true)
@@ -163,9 +172,9 @@
         conditonCount += 1
       }
     })
-    workFlowStore.conditonErrorCount = conditonCount
-    workFlowStore.approverErrorCount = approverCount
-    tipVisible.value = true
+    workFlowStore.conditonErrorCount = conditonCount // 存入store
+    workFlowStore.approverErrorCount = approverCount // 存入store
+    tipVisible.value = true // 显示空节点提示框
     return
   }
 
@@ -188,11 +197,12 @@
       type: 1, // 成员
     }
 
-    const res = await addProcess(processConfig.value)
-    if (res.code == 200) {
+    addProcess(processConfig.value).then(() => {
       ElMessage.success('创建流程成功')
-      emits('createProcessSuccess')
-    }
+      emits('createProcessSuccess') // 返回列表页
+    }).catch(() => { // 流程异常情况: 所填写的formID已经存在
+      emits('createProcessSuccess') // 返回列表页
+    })
   }
   loading.close()
 }
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 2a22a79..660ac13 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -1,17 +1,15 @@
 <!-- 新建流程页面 -->
 <script lang="ts" setup name="EditProcess">
-import { onMounted, reactive, ref } from 'vue'
+import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
-import setting from '../../setting.vue'
-import type { IBusinessList, Iform } from './process'
+import Setting from '../../setting.vue'
+import type { Iform } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
-const $route = useRoute()
-const getRowData = ref({}) as any
 const ruleFormRef = ref<FormInstance>()
 const form: Ref<Iform> = ref({
   number: '', // 编号
@@ -19,55 +17,9 @@
   business: '', // 关联业务
   formID: '', // formID
   desc: '', // 流程描述
-  selectDecision: '', // 选择的决策
-  rejectTo: '', // 可驳回至
-  changeData: '', // 驳回修改数据
-  isMessage: '', // 审批结果通知发起人
 })
-// 可选决策项
-const decision = [
-  {
-    id: 'reject-refuse',
-    title: '同意 驳回 拒绝',
-  },
-  {
-    id: 'reject',
-    title: '同意 驳回',
-  },
-  {
-    id: 'refuse',
-    title: '同意 拒绝',
-  },
-]
-// 可驳回至
-const reject = [
-  {
-    id: 'change',
-    title: '单据修改',
-  },
-]
-// 驳回修改数据
-const rejectChangeData = [
-  {
-    id: 'all',
-    title: '重新按流程走',
-  },
-  {
-    id: 'part',
-    title: '送至驳回节点',
-  },
-]
-// 审批结果通知发起人
-const messageData = [
-  {
-    id: 'yes',
-    title: '是',
-  },
-  {
-    id: 'no',
-    title: '否',
-  },
-]
+
+// 表单校验
 const rules = reactive<FormRules>({
   name: [
     {
@@ -104,6 +56,7 @@
 const close = () => {
   $router.back()
 }
+
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -115,20 +68,7 @@
   })
 }
 
-// 选择决策项
-const changeDecision = (value: string) => {
-  form.value.selectDecision = value
-}
-const changeRejectTo = (value: string) => {
-  form.value.rejectTo = value
-}
-const changeData = (value: string) => {
-  form.value.changeData = value
-}
-const changeMessage = (value: string) => {
-  form.value.isMessage = value
-}
-
+// 监听流程组件--新建流程成功
 const createProcessSuccess = () => {
   close()
 }
@@ -152,42 +92,11 @@
               <el-form-item label="流程编号:">
                 <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
-              <!-- <el-form-item label="可选决策项" prop="selectDecision">
-                <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
-                  <el-option
-                    v-for="item in decision"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="流程名称:" prop="name">
                 <el-input v-model="form.name" placeholder="请输入流程名称" />
               </el-form-item>
-
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
-                <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
-                  <el-option
-                    v-for="item in reject"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
-              <!-- <el-form-item label="审批结果通知发起人" prop="isMessage">
-                <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
-                  <el-option
-                    v-for="item in messageData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="formID:" prop="formID">
@@ -198,16 +107,6 @@
               <el-form-item label="关联业务:" prop="business">
                 <el-input v-model="form.business" placeholder="请输入关联业务" />
               </el-form-item>
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
-                <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
-                  <el-option
-                    v-for="item in rejectChangeData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="16">
               <el-form-item label="流程描述" prop="desc">

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index e0c98f7..a58f41e 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -25,31 +25,6 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig: any) {
-    // let tempValue = '会签'
-    // let strPeople = ' '
-    // if (nodeConfig.selectCustomApprovalType === 'huoqian') {
-    //   tempValue = '或签'
-    // }
-    // if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-    // else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
-    //   let strPeople = ' '
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责(逐级审批)`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（逐级审批-${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-
     if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
       if (nodeConfig.nodeUserList.length == 1) {
         return nodeConfig.nodeUserList[0].name
@@ -83,7 +58,7 @@
     const arr = []
     const list = str.split(',')
     for (var elem in obj) {
-      list.map((item) => {
+      list.map((item: any) => {
         if (item == elem) {
           arr.push(obj[elem].value)
         }
@@ -118,11 +93,6 @@
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
-    // else {
-    //   if (nodeConfig.ccSelfSelectFlag == 1) {
-    //     return '发起人自选'
-    //   }
-    // }
   },
   toggleStrClass(item: any, key: any) {
     const a = item.zdy1 ? item.zdy1.split(',') : []
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..734f146 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -13,7 +12,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -300,26 +298,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(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)
-            }
-          })
-        }
-        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)
-            }
-          })
-        }
+        updateSample(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)
+          }
+        })
       })
     }
   })
@@ -604,7 +590,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -614,7 +600,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -625,6 +611,34 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 74e0a67..759e08a 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -16,8 +16,9 @@
   interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
-} from '@/api/business/schedule'
+} from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -64,7 +65,7 @@
   { text: '委托方代码', value: 'customerId', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
@@ -79,7 +80,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'deliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -139,7 +140,7 @@
       customerId: 'test', // 委托方代码
       customerName: 'test', // 委托方名称
       deliverer: 'test', // 送检人
-      isUrgent: '2', // 是否加急
+      isUrgent: '1', // 是否加急
       sampleAttr: '1', // 样品属性
       planDeliverTime: 'test', // 预计送达时间
       deliverTime: 'test', // 实际送达时间
@@ -151,7 +152,6 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
       sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
@@ -452,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="240">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
@@ -496,7 +496,7 @@
                 type="danger"
                 @click="handleEdit(row, 'delete', '删除')"
               >
-                删除
+                无需检测
               </el-button>
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index e8b9bfc..60c292d 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -1,10 +1,378 @@
 <script lang="ts" setup name="OrderList">
-// 委托书
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IListQuery, IOrderList } from './orderList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
+const { proxy } = getCurrentInstance() as any
+
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  orderCode: '', // 委托书编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  deliverer: '', // 送样人
+  isUrgent: '', // 是否加急
+  status: '', // 接收状态
+  offset: 1,
+  limit: 20,
+})
+// 是否加急
+const isUrgentMap = [
+  { label: '全部', value: '0' },
+  { label: '是', value: '1' },
+  { label: '否', value: '2' },
+]
+// 接收状态
+const statusMap = [
+  { label: '全部', value: '0' },
+  { label: '已接收', value: '1' },
+  { label: '未接收', value: '2' },
+  { label: '已取消', value: '3' },
+]
+
+const columns = ref<TableColumn[]>([
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '样品数量', value: 'sampleQuantity', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '接收状态', value: 'status', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IOrderList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getInterChangeList(listQuery.value).then((response) => {
+  //   response.data.rows = [
+  //     {
+  //       id: 'test',
+  //       sampleNo: 'test', // 样品编号
+  //       sampleName: 'test', // 样品名称
+  //       sampleModel: 'test', // 型号
+  //       evaluationName: 'test', // 出厂编号
+  //       orderCode: 'test', // 委托书编号
+  //       customerId: 'test', // 委托方代码
+  //       customerName: 'test', // 委托方名称
+  //       deliverer: 'test', // 送检人
+  //       isUrgent: 'test', // 是否加急
+  //       sampleAttr: 'test', // 样品属性
+  //       planDeliverTime: 'test', // 预计送达时间
+  //     }]
+  //   list.value = response.data.rows.map((item: IinterchangeList) => {
+  //     return {
+  //       ...item,
+  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+  //     }
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      id: 'test',
+      orderCode: 'test', // 委托书编号
+      customerId: 'test', // 委托方代码
+      customerName: 'test', // 委托方名称
+      deliverer: 'test', // 送检人
+      delivererTel: 'test', // 送样人联系方式
+      sampleQuantity: 40, // 样品数量
+      isUrgent: '1', // 是否加急
+      status: 'test', // 接收状态
+      createTime: 'test', // 创建时间
+      remark: '备注',
+    },
+  ]
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    orderCode: '', // 委托书编号
+    customerId: '', // 委托方代码
+    customerName: '', // 委托方名称
+    deliverer: '', // 送样人
+    isUrgent: '', // 是否加急
+    status: '', // 接收状态
+    offset: 1,
+    limit: 20,
+  }
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IOrderList, type: string, title: string) => {
+  ElMessageBox.confirm(
+    `确认${title}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      if (type === 'receive') { // 接收
+        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+      else if (type === 'back') { // 退回
+        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      orderCode: '', // 委托书编号
+      customerId: '', // 委托方代码
+      customerName: '', // 委托方名称
+      deliverer: '', // 送样人
+      isUrgent: '', // 是否加急
+      status: '', // 接收状态
+      ids: checkoutList.value,
+    }
+    // exportInterchangeList(params).then((res) => {
+    //   const blob = new Blob([res.data])
+    //   exportFile(blob, '委托书列表.xlsx')
+    // })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+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: IOrderList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备收发列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  // todo: 校验文件类型，调用上传接口
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      // const fd = new FormData()
+      // fd.append('multipartFile', event.target.files[0])
+      // uploadApi(fd).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage.success('上传成功')
+      //   }
+      //   else {
+      //     ElMessage.error(res.message)
+      //   }
+      // })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+
+// 点击批量导入
+const uploadAll = () => {
+  fileRef.value.click()
+}
+
+// 点击编辑详情
+const goEdit = (row: IOrderList, type: string) => {
+
+}
+
+fetchData(true)
 </script>
 
 <template>
   <app-container>
-    委托书
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderCode"
+          placeholder="委托书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerId"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.deliverer"
+          placeholder="送样人"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in isUrgentMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in statusMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="170">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="goEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="goEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'receive', '接收')"
+              >
+                接收
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'back', '退回')"
+              >
+                退回
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
new file mode 100644
index 0000000..1d2c1bd
--- /dev/null
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -0,0 +1,27 @@
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+export interface IListQuery {
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送样人
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  offset: number
+  limit: number
+}
+
+// 表格
+export interface IOrderList {
+  id: string
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  sampleQuantity: number | string // 样品数量
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  createTime: string // 创建时间
+  remark: string // 备注
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 153b66e..c27e136 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,7 +13,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -603,7 +602,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -613,7 +612,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -623,6 +622,34 @@
                 />
               </el-form-item>
             </el-col>
+            <!-- <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 577779f..aa181ed 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -1,15 +1,14 @@
-<script setup lang="ts" name="ProcessSetting">
+<script setup lang="ts" name="Setting">
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineExpose, nextTick, onMounted, ref } from 'vue'
-import { useRoute } from 'vue-router'
 import useWorkFlowStore from '@/store/modules/workFlow'
 import errorDialog from '@/components/dialog/errorDialog.vue'
 import approverDrawer from '@/components/drawer/approverDrawer.vue'
 import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
 import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
-import { addProcess, editProcess, getDirectorLevel, getProcessDetail, unloadProcess } from '@/api/system/process'
+import { addProcess, editProcess, getDirectorLevel, getProcessDetail } from '@/api/system/process'
 import userStore from '@/store/modules/user'
-import type { ITipList } from '@/views/system/process/process'
+import type { ITipList, IworkFlowDef } from '@/views/system/process/process'
 const props = defineProps({
   allowEditNode: {
     type: Boolean,
@@ -30,14 +29,17 @@
 
 const user = userStore()
 const workFlowStore = useWorkFlowStore()
-const router = useRouter()
 const tipList = ref<ITipList[]>([]) // 统计空节点的数组
 const tipVisible = ref(false) // 控制提示空节点对话框显隐
 const nowVal = ref(100)
 const nodeConfig = ref({})
-const workFlowDef = ref({})
+const workFlowDef = ref<IworkFlowDef>({
+  name: '审批流程',
+})
 const flowPermission = ref([])
 const directorMaxLevel = ref(0)
+
+// 初始化--请求流程图详细信息
 const initDetail = async (formid: string) => {
   const res = await getProcessDetail(formid)
   return res.data
@@ -49,7 +51,7 @@
   getDirectorLevel(user.id).then((res) => {
     max = res.data.level
   })
-  const route = useRoute()
+  window.sessionStorage.setItem('maxLevel', `${max}`)
   nextTick(async () => {
     let data
     if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
@@ -59,7 +61,7 @@
       data = {
         tableId: 1,
         workFlowDef: {
-          name: '合同审批',
+          name: '审批流程',
         },
         directorMaxLevel: max,
         flowPermission: [],
@@ -81,19 +83,19 @@
         },
       }
     }
-    processConfig.value = data
+    processConfig.value = data // 流程设置
     const {
-      nodeConfig: nodes,
+      nodeConfig: nodes, // 节点设置
       flowPermission: flows, // 发起人
-      // directorMaxLevel: directors,
-      workFlowDef: works,
+      workFlowDef: works, // 流程基本信息
       tableId,
     } = data
-    nodeConfig.value = nodes
-    flowPermission.value = flows
-    // directorMaxLevel.value = directors
-    directorMaxLevel.value = max
-    workFlowDef.value = works
+    nodeConfig.value = nodes // 节点配置
+    flowPermission.value = flows // 发起人
+    directorMaxLevel.value = max // 用户主管最大层级数
+    workFlowDef.value = works // 流程基本信息
+    window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
+    window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
     workFlowStore.setTableId(tableId)
   })
 })
@@ -132,13 +134,12 @@
 // 保存流程图
 const saveSet = async () => {
   if (!props.isAddProcess) { // 编辑
-    processConfig.value.formId = props.getRowData.formId
+    processConfig.value.formId = props.getRowData.formId // 已有formid
     processConfig.value.formName = props.getRowData.formName
     processConfig.value.formDesc = props.getRowData.formDesc
     processConfig.value.formContent = props.getRowData.formDesc
     processConfig.value.workFlowDef.flowKey = props.getRowData.flowKey
     processConfig.value.workFlowDef.directorId = props.getRowData.directorId
-    processConfig.value.workFlowDef.name = props.getRowData.name
   }
   else { // 新建
     processConfig.value.formId = props.getRowData.formID
@@ -146,7 +147,15 @@
     processConfig.value.formDesc = props.getRowData.desc
     processConfig.value.formContent = props.getRowData.desc
     processConfig.value.workFlowDef.directorId = user.id
-    processConfig.value.workFlowDef.name = props.getRowData.name
+  }
+  processConfig.value.workFlowDef.name = props.getRowData.name // 流程名称
+  const decisionItem = window.sessionStorage.getItem('decisionItem')
+  const noticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (decisionItem) {
+    processConfig.value.workFlowDef.decisionItem = parseInt(decisionItem) // 可选决策项
+  }
+  if (noticeStarter) {
+    processConfig.value.workFlowDef.noticeStarter = parseInt(noticeStarter) // 审批结果通知发起人
   }
 
   workFlowStore.setIsTried(true)
@@ -163,9 +172,9 @@
         conditonCount += 1
       }
     })
-    workFlowStore.conditonErrorCount = conditonCount
-    workFlowStore.approverErrorCount = approverCount
-    tipVisible.value = true
+    workFlowStore.conditonErrorCount = conditonCount // 存入store
+    workFlowStore.approverErrorCount = approverCount // 存入store
+    tipVisible.value = true // 显示空节点提示框
     return
   }
 
@@ -188,11 +197,12 @@
       type: 1, // 成员
     }
 
-    const res = await addProcess(processConfig.value)
-    if (res.code == 200) {
+    addProcess(processConfig.value).then(() => {
       ElMessage.success('创建流程成功')
-      emits('createProcessSuccess')
-    }
+      emits('createProcessSuccess') // 返回列表页
+    }).catch(() => { // 流程异常情况: 所填写的formID已经存在
+      emits('createProcessSuccess') // 返回列表页
+    })
   }
   loading.close()
 }
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 2a22a79..660ac13 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -1,17 +1,15 @@
 <!-- 新建流程页面 -->
 <script lang="ts" setup name="EditProcess">
-import { onMounted, reactive, ref } from 'vue'
+import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
-import setting from '../../setting.vue'
-import type { IBusinessList, Iform } from './process'
+import Setting from '../../setting.vue'
+import type { Iform } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
-const $route = useRoute()
-const getRowData = ref({}) as any
 const ruleFormRef = ref<FormInstance>()
 const form: Ref<Iform> = ref({
   number: '', // 编号
@@ -19,55 +17,9 @@
   business: '', // 关联业务
   formID: '', // formID
   desc: '', // 流程描述
-  selectDecision: '', // 选择的决策
-  rejectTo: '', // 可驳回至
-  changeData: '', // 驳回修改数据
-  isMessage: '', // 审批结果通知发起人
 })
-// 可选决策项
-const decision = [
-  {
-    id: 'reject-refuse',
-    title: '同意 驳回 拒绝',
-  },
-  {
-    id: 'reject',
-    title: '同意 驳回',
-  },
-  {
-    id: 'refuse',
-    title: '同意 拒绝',
-  },
-]
-// 可驳回至
-const reject = [
-  {
-    id: 'change',
-    title: '单据修改',
-  },
-]
-// 驳回修改数据
-const rejectChangeData = [
-  {
-    id: 'all',
-    title: '重新按流程走',
-  },
-  {
-    id: 'part',
-    title: '送至驳回节点',
-  },
-]
-// 审批结果通知发起人
-const messageData = [
-  {
-    id: 'yes',
-    title: '是',
-  },
-  {
-    id: 'no',
-    title: '否',
-  },
-]
+
+// 表单校验
 const rules = reactive<FormRules>({
   name: [
     {
@@ -104,6 +56,7 @@
 const close = () => {
   $router.back()
 }
+
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -115,20 +68,7 @@
   })
 }
 
-// 选择决策项
-const changeDecision = (value: string) => {
-  form.value.selectDecision = value
-}
-const changeRejectTo = (value: string) => {
-  form.value.rejectTo = value
-}
-const changeData = (value: string) => {
-  form.value.changeData = value
-}
-const changeMessage = (value: string) => {
-  form.value.isMessage = value
-}
-
+// 监听流程组件--新建流程成功
 const createProcessSuccess = () => {
   close()
 }
@@ -152,42 +92,11 @@
               <el-form-item label="流程编号:">
                 <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
-              <!-- <el-form-item label="可选决策项" prop="selectDecision">
-                <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
-                  <el-option
-                    v-for="item in decision"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="流程名称:" prop="name">
                 <el-input v-model="form.name" placeholder="请输入流程名称" />
               </el-form-item>
-
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
-                <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
-                  <el-option
-                    v-for="item in reject"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
-              <!-- <el-form-item label="审批结果通知发起人" prop="isMessage">
-                <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
-                  <el-option
-                    v-for="item in messageData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="formID:" prop="formID">
@@ -198,16 +107,6 @@
               <el-form-item label="关联业务:" prop="business">
                 <el-input v-model="form.business" placeholder="请输入关联业务" />
               </el-form-item>
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
-                <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
-                  <el-option
-                    v-for="item in rejectChangeData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="16">
               <el-form-item label="流程描述" prop="desc">
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 26374ea..584d31e 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -17,55 +17,7 @@
   name: '', // 名称
   business: '', // 关联业务
   desc: '', // 流程描述
-  selectDecision: '同意 驳回 拒绝', // 选择的决策
-  rejectTo: '2', // 可驳回至
-  changeData: '2', // 驳回修改数据
-  isMessage: 'shi', // 审批结果通知发起人
 })
-// 可选决策项
-const decision = [
-  {
-    id: 'reject-refuse',
-    title: '同意 驳回 拒绝',
-  },
-  {
-    id: 'reject',
-    title: '同意 驳回',
-  },
-  {
-    id: 'refuse',
-    title: '同意 拒绝',
-  },
-]
-// 可驳回至
-const reject = [
-  {
-    id: 'change',
-    title: '单据修改',
-  },
-]
-// 驳回修改数据
-const rejectChangeData = [
-  {
-    id: 'all',
-    title: '重新按流程走',
-  },
-  {
-    id: 'part',
-    title: '送至驳回节点',
-  },
-]
-// 审批结果通知发起人
-const messageData = [
-  {
-    id: 'yes',
-    title: '是',
-  },
-  {
-    id: 'no',
-    title: '否',
-  },
-]
 const $router = useRouter()
 // 关闭
 const close = () => {
@@ -96,18 +48,7 @@
           <el-col :span="8">
             <el-form-item label="流程编号">
               <el-input v-model="form.number" disabled type="textarea" autosize />
-              <!-- {{ form.number }} -->
             </el-form-item>
-            <!-- <el-form-item label="可选决策项">
-              <el-select v-model="form.selectDecision" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in decision"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
             <el-form-item label="流程描述">
               <el-input v-model="form.desc" disabled type="textarea" autosize />
             </el-form-item>
@@ -115,47 +56,12 @@
           <el-col :span="8">
             <el-form-item label="流程名称">
               <el-input v-model="form.name" disabled />
-
-              <!-- {{ form.name }} -->
             </el-form-item>
-
-            <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至">
-              <el-select v-model="form.rejectTo" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in reject"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
-            <!-- <el-form-item label="审批结果通知发起人">
-              <el-select v-model="form.isMessage" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in messageData"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
           </el-col>
           <el-col :span="8">
             <el-form-item label="关联业务">
               <el-input v-model="form.business" disabled />
-
-              <!-- {{ form.business }} -->
             </el-form-item>
-            <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据">
-              <el-select v-model="form.changeData" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in rejectChangeData"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
           </el-col>
         </el-row>
       </el-form>

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index e0c98f7..a58f41e 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -25,31 +25,6 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig: any) {
-    // let tempValue = '会签'
-    // let strPeople = ' '
-    // if (nodeConfig.selectCustomApprovalType === 'huoqian') {
-    //   tempValue = '或签'
-    // }
-    // if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-    // else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
-    //   let strPeople = ' '
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责(逐级审批)`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（逐级审批-${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-
     if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
       if (nodeConfig.nodeUserList.length == 1) {
         return nodeConfig.nodeUserList[0].name
@@ -83,7 +58,7 @@
     const arr = []
     const list = str.split(',')
     for (var elem in obj) {
-      list.map((item) => {
+      list.map((item: any) => {
         if (item == elem) {
           arr.push(obj[elem].value)
         }
@@ -118,11 +93,6 @@
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
-    // else {
-    //   if (nodeConfig.ccSelfSelectFlag == 1) {
-    //     return '发起人自选'
-    //   }
-    // }
   },
   toggleStrClass(item: any, key: any) {
     const a = item.zdy1 ? item.zdy1.split(',') : []
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..734f146 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -13,7 +12,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -300,26 +298,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(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)
-            }
-          })
-        }
-        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)
-            }
-          })
-        }
+        updateSample(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)
+          }
+        })
       })
     }
   })
@@ -604,7 +590,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -614,7 +600,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -625,6 +611,34 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 74e0a67..759e08a 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -16,8 +16,9 @@
   interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
-} from '@/api/business/schedule'
+} from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -64,7 +65,7 @@
   { text: '委托方代码', value: 'customerId', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
@@ -79,7 +80,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'deliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -139,7 +140,7 @@
       customerId: 'test', // 委托方代码
       customerName: 'test', // 委托方名称
       deliverer: 'test', // 送检人
-      isUrgent: '2', // 是否加急
+      isUrgent: '1', // 是否加急
       sampleAttr: '1', // 样品属性
       planDeliverTime: 'test', // 预计送达时间
       deliverTime: 'test', // 实际送达时间
@@ -151,7 +152,6 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
       sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
@@ -452,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="240">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
@@ -496,7 +496,7 @@
                 type="danger"
                 @click="handleEdit(row, 'delete', '删除')"
               >
-                删除
+                无需检测
               </el-button>
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index e8b9bfc..60c292d 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -1,10 +1,378 @@
 <script lang="ts" setup name="OrderList">
-// 委托书
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IListQuery, IOrderList } from './orderList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
+const { proxy } = getCurrentInstance() as any
+
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  orderCode: '', // 委托书编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  deliverer: '', // 送样人
+  isUrgent: '', // 是否加急
+  status: '', // 接收状态
+  offset: 1,
+  limit: 20,
+})
+// 是否加急
+const isUrgentMap = [
+  { label: '全部', value: '0' },
+  { label: '是', value: '1' },
+  { label: '否', value: '2' },
+]
+// 接收状态
+const statusMap = [
+  { label: '全部', value: '0' },
+  { label: '已接收', value: '1' },
+  { label: '未接收', value: '2' },
+  { label: '已取消', value: '3' },
+]
+
+const columns = ref<TableColumn[]>([
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '样品数量', value: 'sampleQuantity', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '接收状态', value: 'status', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IOrderList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getInterChangeList(listQuery.value).then((response) => {
+  //   response.data.rows = [
+  //     {
+  //       id: 'test',
+  //       sampleNo: 'test', // 样品编号
+  //       sampleName: 'test', // 样品名称
+  //       sampleModel: 'test', // 型号
+  //       evaluationName: 'test', // 出厂编号
+  //       orderCode: 'test', // 委托书编号
+  //       customerId: 'test', // 委托方代码
+  //       customerName: 'test', // 委托方名称
+  //       deliverer: 'test', // 送检人
+  //       isUrgent: 'test', // 是否加急
+  //       sampleAttr: 'test', // 样品属性
+  //       planDeliverTime: 'test', // 预计送达时间
+  //     }]
+  //   list.value = response.data.rows.map((item: IinterchangeList) => {
+  //     return {
+  //       ...item,
+  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+  //     }
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      id: 'test',
+      orderCode: 'test', // 委托书编号
+      customerId: 'test', // 委托方代码
+      customerName: 'test', // 委托方名称
+      deliverer: 'test', // 送检人
+      delivererTel: 'test', // 送样人联系方式
+      sampleQuantity: 40, // 样品数量
+      isUrgent: '1', // 是否加急
+      status: 'test', // 接收状态
+      createTime: 'test', // 创建时间
+      remark: '备注',
+    },
+  ]
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    orderCode: '', // 委托书编号
+    customerId: '', // 委托方代码
+    customerName: '', // 委托方名称
+    deliverer: '', // 送样人
+    isUrgent: '', // 是否加急
+    status: '', // 接收状态
+    offset: 1,
+    limit: 20,
+  }
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IOrderList, type: string, title: string) => {
+  ElMessageBox.confirm(
+    `确认${title}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      if (type === 'receive') { // 接收
+        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+      else if (type === 'back') { // 退回
+        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      orderCode: '', // 委托书编号
+      customerId: '', // 委托方代码
+      customerName: '', // 委托方名称
+      deliverer: '', // 送样人
+      isUrgent: '', // 是否加急
+      status: '', // 接收状态
+      ids: checkoutList.value,
+    }
+    // exportInterchangeList(params).then((res) => {
+    //   const blob = new Blob([res.data])
+    //   exportFile(blob, '委托书列表.xlsx')
+    // })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+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: IOrderList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备收发列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  // todo: 校验文件类型，调用上传接口
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      // const fd = new FormData()
+      // fd.append('multipartFile', event.target.files[0])
+      // uploadApi(fd).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage.success('上传成功')
+      //   }
+      //   else {
+      //     ElMessage.error(res.message)
+      //   }
+      // })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+
+// 点击批量导入
+const uploadAll = () => {
+  fileRef.value.click()
+}
+
+// 点击编辑详情
+const goEdit = (row: IOrderList, type: string) => {
+
+}
+
+fetchData(true)
 </script>
 
 <template>
   <app-container>
-    委托书
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderCode"
+          placeholder="委托书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerId"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.deliverer"
+          placeholder="送样人"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in isUrgentMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in statusMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="170">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="goEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="goEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'receive', '接收')"
+              >
+                接收
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'back', '退回')"
+              >
+                退回
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
new file mode 100644
index 0000000..1d2c1bd
--- /dev/null
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -0,0 +1,27 @@
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+export interface IListQuery {
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送样人
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  offset: number
+  limit: number
+}
+
+// 表格
+export interface IOrderList {
+  id: string
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  sampleQuantity: number | string // 样品数量
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  createTime: string // 创建时间
+  remark: string // 备注
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 153b66e..c27e136 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,7 +13,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -603,7 +602,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -613,7 +612,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -623,6 +622,34 @@
                 />
               </el-form-item>
             </el-col>
+            <!-- <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 577779f..aa181ed 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -1,15 +1,14 @@
-<script setup lang="ts" name="ProcessSetting">
+<script setup lang="ts" name="Setting">
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineExpose, nextTick, onMounted, ref } from 'vue'
-import { useRoute } from 'vue-router'
 import useWorkFlowStore from '@/store/modules/workFlow'
 import errorDialog from '@/components/dialog/errorDialog.vue'
 import approverDrawer from '@/components/drawer/approverDrawer.vue'
 import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
 import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
-import { addProcess, editProcess, getDirectorLevel, getProcessDetail, unloadProcess } from '@/api/system/process'
+import { addProcess, editProcess, getDirectorLevel, getProcessDetail } from '@/api/system/process'
 import userStore from '@/store/modules/user'
-import type { ITipList } from '@/views/system/process/process'
+import type { ITipList, IworkFlowDef } from '@/views/system/process/process'
 const props = defineProps({
   allowEditNode: {
     type: Boolean,
@@ -30,14 +29,17 @@
 
 const user = userStore()
 const workFlowStore = useWorkFlowStore()
-const router = useRouter()
 const tipList = ref<ITipList[]>([]) // 统计空节点的数组
 const tipVisible = ref(false) // 控制提示空节点对话框显隐
 const nowVal = ref(100)
 const nodeConfig = ref({})
-const workFlowDef = ref({})
+const workFlowDef = ref<IworkFlowDef>({
+  name: '审批流程',
+})
 const flowPermission = ref([])
 const directorMaxLevel = ref(0)
+
+// 初始化--请求流程图详细信息
 const initDetail = async (formid: string) => {
   const res = await getProcessDetail(formid)
   return res.data
@@ -49,7 +51,7 @@
   getDirectorLevel(user.id).then((res) => {
     max = res.data.level
   })
-  const route = useRoute()
+  window.sessionStorage.setItem('maxLevel', `${max}`)
   nextTick(async () => {
     let data
     if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
@@ -59,7 +61,7 @@
       data = {
         tableId: 1,
         workFlowDef: {
-          name: '合同审批',
+          name: '审批流程',
         },
         directorMaxLevel: max,
         flowPermission: [],
@@ -81,19 +83,19 @@
         },
       }
     }
-    processConfig.value = data
+    processConfig.value = data // 流程设置
     const {
-      nodeConfig: nodes,
+      nodeConfig: nodes, // 节点设置
       flowPermission: flows, // 发起人
-      // directorMaxLevel: directors,
-      workFlowDef: works,
+      workFlowDef: works, // 流程基本信息
       tableId,
     } = data
-    nodeConfig.value = nodes
-    flowPermission.value = flows
-    // directorMaxLevel.value = directors
-    directorMaxLevel.value = max
-    workFlowDef.value = works
+    nodeConfig.value = nodes // 节点配置
+    flowPermission.value = flows // 发起人
+    directorMaxLevel.value = max // 用户主管最大层级数
+    workFlowDef.value = works // 流程基本信息
+    window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
+    window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
     workFlowStore.setTableId(tableId)
   })
 })
@@ -132,13 +134,12 @@
 // 保存流程图
 const saveSet = async () => {
   if (!props.isAddProcess) { // 编辑
-    processConfig.value.formId = props.getRowData.formId
+    processConfig.value.formId = props.getRowData.formId // 已有formid
     processConfig.value.formName = props.getRowData.formName
     processConfig.value.formDesc = props.getRowData.formDesc
     processConfig.value.formContent = props.getRowData.formDesc
     processConfig.value.workFlowDef.flowKey = props.getRowData.flowKey
     processConfig.value.workFlowDef.directorId = props.getRowData.directorId
-    processConfig.value.workFlowDef.name = props.getRowData.name
   }
   else { // 新建
     processConfig.value.formId = props.getRowData.formID
@@ -146,7 +147,15 @@
     processConfig.value.formDesc = props.getRowData.desc
     processConfig.value.formContent = props.getRowData.desc
     processConfig.value.workFlowDef.directorId = user.id
-    processConfig.value.workFlowDef.name = props.getRowData.name
+  }
+  processConfig.value.workFlowDef.name = props.getRowData.name // 流程名称
+  const decisionItem = window.sessionStorage.getItem('decisionItem')
+  const noticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (decisionItem) {
+    processConfig.value.workFlowDef.decisionItem = parseInt(decisionItem) // 可选决策项
+  }
+  if (noticeStarter) {
+    processConfig.value.workFlowDef.noticeStarter = parseInt(noticeStarter) // 审批结果通知发起人
   }
 
   workFlowStore.setIsTried(true)
@@ -163,9 +172,9 @@
         conditonCount += 1
       }
     })
-    workFlowStore.conditonErrorCount = conditonCount
-    workFlowStore.approverErrorCount = approverCount
-    tipVisible.value = true
+    workFlowStore.conditonErrorCount = conditonCount // 存入store
+    workFlowStore.approverErrorCount = approverCount // 存入store
+    tipVisible.value = true // 显示空节点提示框
     return
   }
 
@@ -188,11 +197,12 @@
       type: 1, // 成员
     }
 
-    const res = await addProcess(processConfig.value)
-    if (res.code == 200) {
+    addProcess(processConfig.value).then(() => {
       ElMessage.success('创建流程成功')
-      emits('createProcessSuccess')
-    }
+      emits('createProcessSuccess') // 返回列表页
+    }).catch(() => { // 流程异常情况: 所填写的formID已经存在
+      emits('createProcessSuccess') // 返回列表页
+    })
   }
   loading.close()
 }
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 2a22a79..660ac13 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -1,17 +1,15 @@
 <!-- 新建流程页面 -->
 <script lang="ts" setup name="EditProcess">
-import { onMounted, reactive, ref } from 'vue'
+import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
-import setting from '../../setting.vue'
-import type { IBusinessList, Iform } from './process'
+import Setting from '../../setting.vue'
+import type { Iform } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
-const $route = useRoute()
-const getRowData = ref({}) as any
 const ruleFormRef = ref<FormInstance>()
 const form: Ref<Iform> = ref({
   number: '', // 编号
@@ -19,55 +17,9 @@
   business: '', // 关联业务
   formID: '', // formID
   desc: '', // 流程描述
-  selectDecision: '', // 选择的决策
-  rejectTo: '', // 可驳回至
-  changeData: '', // 驳回修改数据
-  isMessage: '', // 审批结果通知发起人
 })
-// 可选决策项
-const decision = [
-  {
-    id: 'reject-refuse',
-    title: '同意 驳回 拒绝',
-  },
-  {
-    id: 'reject',
-    title: '同意 驳回',
-  },
-  {
-    id: 'refuse',
-    title: '同意 拒绝',
-  },
-]
-// 可驳回至
-const reject = [
-  {
-    id: 'change',
-    title: '单据修改',
-  },
-]
-// 驳回修改数据
-const rejectChangeData = [
-  {
-    id: 'all',
-    title: '重新按流程走',
-  },
-  {
-    id: 'part',
-    title: '送至驳回节点',
-  },
-]
-// 审批结果通知发起人
-const messageData = [
-  {
-    id: 'yes',
-    title: '是',
-  },
-  {
-    id: 'no',
-    title: '否',
-  },
-]
+
+// 表单校验
 const rules = reactive<FormRules>({
   name: [
     {
@@ -104,6 +56,7 @@
 const close = () => {
   $router.back()
 }
+
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -115,20 +68,7 @@
   })
 }
 
-// 选择决策项
-const changeDecision = (value: string) => {
-  form.value.selectDecision = value
-}
-const changeRejectTo = (value: string) => {
-  form.value.rejectTo = value
-}
-const changeData = (value: string) => {
-  form.value.changeData = value
-}
-const changeMessage = (value: string) => {
-  form.value.isMessage = value
-}
-
+// 监听流程组件--新建流程成功
 const createProcessSuccess = () => {
   close()
 }
@@ -152,42 +92,11 @@
               <el-form-item label="流程编号:">
                 <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
-              <!-- <el-form-item label="可选决策项" prop="selectDecision">
-                <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
-                  <el-option
-                    v-for="item in decision"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="流程名称:" prop="name">
                 <el-input v-model="form.name" placeholder="请输入流程名称" />
               </el-form-item>
-
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
-                <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
-                  <el-option
-                    v-for="item in reject"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
-              <!-- <el-form-item label="审批结果通知发起人" prop="isMessage">
-                <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
-                  <el-option
-                    v-for="item in messageData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="formID:" prop="formID">
@@ -198,16 +107,6 @@
               <el-form-item label="关联业务:" prop="business">
                 <el-input v-model="form.business" placeholder="请输入关联业务" />
               </el-form-item>
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
-                <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
-                  <el-option
-                    v-for="item in rejectChangeData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="16">
               <el-form-item label="流程描述" prop="desc">
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 26374ea..584d31e 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -17,55 +17,7 @@
   name: '', // 名称
   business: '', // 关联业务
   desc: '', // 流程描述
-  selectDecision: '同意 驳回 拒绝', // 选择的决策
-  rejectTo: '2', // 可驳回至
-  changeData: '2', // 驳回修改数据
-  isMessage: 'shi', // 审批结果通知发起人
 })
-// 可选决策项
-const decision = [
-  {
-    id: 'reject-refuse',
-    title: '同意 驳回 拒绝',
-  },
-  {
-    id: 'reject',
-    title: '同意 驳回',
-  },
-  {
-    id: 'refuse',
-    title: '同意 拒绝',
-  },
-]
-// 可驳回至
-const reject = [
-  {
-    id: 'change',
-    title: '单据修改',
-  },
-]
-// 驳回修改数据
-const rejectChangeData = [
-  {
-    id: 'all',
-    title: '重新按流程走',
-  },
-  {
-    id: 'part',
-    title: '送至驳回节点',
-  },
-]
-// 审批结果通知发起人
-const messageData = [
-  {
-    id: 'yes',
-    title: '是',
-  },
-  {
-    id: 'no',
-    title: '否',
-  },
-]
 const $router = useRouter()
 // 关闭
 const close = () => {
@@ -96,18 +48,7 @@
           <el-col :span="8">
             <el-form-item label="流程编号">
               <el-input v-model="form.number" disabled type="textarea" autosize />
-              <!-- {{ form.number }} -->
             </el-form-item>
-            <!-- <el-form-item label="可选决策项">
-              <el-select v-model="form.selectDecision" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in decision"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
             <el-form-item label="流程描述">
               <el-input v-model="form.desc" disabled type="textarea" autosize />
             </el-form-item>
@@ -115,47 +56,12 @@
           <el-col :span="8">
             <el-form-item label="流程名称">
               <el-input v-model="form.name" disabled />
-
-              <!-- {{ form.name }} -->
             </el-form-item>
-
-            <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至">
-              <el-select v-model="form.rejectTo" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in reject"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
-            <!-- <el-form-item label="审批结果通知发起人">
-              <el-select v-model="form.isMessage" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in messageData"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
           </el-col>
           <el-col :span="8">
             <el-form-item label="关联业务">
               <el-input v-model="form.business" disabled />
-
-              <!-- {{ form.business }} -->
             </el-form-item>
-            <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据">
-              <el-select v-model="form.changeData" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in rejectChangeData"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
           </el-col>
         </el-row>
       </el-form>
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index f1cdf25..5f10748 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -18,55 +18,7 @@
   name: '', // 名称
   business: '', // 关联业务
   desc: '', // 流程描述
-  selectDecision: '', // 选择的决策
-  rejectTo: '', // 可驳回至
-  changeData: '', // 驳回修改数据
-  isMessage: '', // 审批结果通知发起人
 })
-// 可选决策项
-const decision = [
-  {
-    id: 'reject-refuse',
-    title: '同意 驳回 拒绝',
-  },
-  {
-    id: 'reject',
-    title: '同意 驳回',
-  },
-  {
-    id: 'refuse',
-    title: '同意 拒绝',
-  },
-]
-// 可驳回至
-const reject = [
-  {
-    id: 'change',
-    title: '单据修改',
-  },
-]
-// 驳回修改数据
-const rejectChangeData = [
-  {
-    id: 'all',
-    title: '重新按流程走',
-  },
-  {
-    id: 'part',
-    title: '送至驳回节点',
-  },
-]
-// 审批结果通知发起人
-const messageData = [
-  {
-    id: 'yes',
-    title: '是',
-  },
-  {
-    id: 'no',
-    title: '否',
-  },
-]
 const rules = reactive<FormRules>({
   selectDecision: [
     {
@@ -101,8 +53,9 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  $router.push('/process/list')
+  $router.back()
 }
+
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -117,20 +70,6 @@
   })
 }
 
-// 选择决策项
-const changeDecision = (value: string) => {
-  form.value.selectDecision = value
-}
-const changeRejectTo = (value: string) => {
-  form.value.rejectTo = value
-}
-const changeData = (value: string) => {
-  form.value.changeData = value
-}
-const changeMessage = (value: string) => {
-  form.value.isMessage = value
-}
-
 onMounted(() => {
   const rowData: any = $route.query.rowData
   getRowData.value = JSON.parse(rowData)
@@ -158,19 +97,8 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="流程编号:">
-                <!-- {{ form.number }} -->
                 <el-input v-model="form.number" disabled type="textarea" autosize />
               </el-form-item>
-              <!-- <el-form-item label="可选决策项" prop="selectDecision">
-                <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
-                  <el-option
-                    v-for="item in decision"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
               <el-form-item label="流程描述">
                 <!-- <el-input v-model="form.desc" type="textarea" /> -->
                 <el-input v-model="form.desc" disabled type="textarea" autosize />
@@ -180,43 +108,11 @@
               <el-form-item label="流程名称:">
                 <el-input v-model="form.name" disabled />
               </el-form-item>
-
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
-                <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
-                  <el-option
-                    v-for="item in reject"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
-              <!-- <el-form-item label="审批结果通知发起人" prop="isMessage">
-                <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
-                  <el-option
-                    v-for="item in messageData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="关联业务:">
-                <!-- {{ form.business }} -->
                 <el-input v-model="form.business" disabled />
               </el-form-item>
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
-                <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
-                  <el-option
-                    v-for="item in rejectChangeData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
           </el-row>
         </el-form>

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index e0c98f7..a58f41e 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -25,31 +25,6 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig: any) {
-    // let tempValue = '会签'
-    // let strPeople = ' '
-    // if (nodeConfig.selectCustomApprovalType === 'huoqian') {
-    //   tempValue = '或签'
-    // }
-    // if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-    // else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
-    //   let strPeople = ' '
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责(逐级审批)`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（逐级审批-${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-
     if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
       if (nodeConfig.nodeUserList.length == 1) {
         return nodeConfig.nodeUserList[0].name
@@ -83,7 +58,7 @@
     const arr = []
     const list = str.split(',')
     for (var elem in obj) {
-      list.map((item) => {
+      list.map((item: any) => {
         if (item == elem) {
           arr.push(obj[elem].value)
         }
@@ -118,11 +93,6 @@
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
-    // else {
-    //   if (nodeConfig.ccSelfSelectFlag == 1) {
-    //     return '发起人自选'
-    //   }
-    // }
   },
   toggleStrClass(item: any, key: any) {
     const a = item.zdy1 ? item.zdy1.split(',') : []
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..734f146 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -13,7 +12,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -300,26 +298,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(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)
-            }
-          })
-        }
-        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)
-            }
-          })
-        }
+        updateSample(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)
+          }
+        })
       })
     }
   })
@@ -604,7 +590,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -614,7 +600,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -625,6 +611,34 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 74e0a67..759e08a 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -16,8 +16,9 @@
   interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
-} from '@/api/business/schedule'
+} from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -64,7 +65,7 @@
   { text: '委托方代码', value: 'customerId', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
@@ -79,7 +80,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'deliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -139,7 +140,7 @@
       customerId: 'test', // 委托方代码
       customerName: 'test', // 委托方名称
       deliverer: 'test', // 送检人
-      isUrgent: '2', // 是否加急
+      isUrgent: '1', // 是否加急
       sampleAttr: '1', // 样品属性
       planDeliverTime: 'test', // 预计送达时间
       deliverTime: 'test', // 实际送达时间
@@ -151,7 +152,6 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
       sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
@@ -452,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="240">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
@@ -496,7 +496,7 @@
                 type="danger"
                 @click="handleEdit(row, 'delete', '删除')"
               >
-                删除
+                无需检测
               </el-button>
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index e8b9bfc..60c292d 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -1,10 +1,378 @@
 <script lang="ts" setup name="OrderList">
-// 委托书
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IListQuery, IOrderList } from './orderList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
+const { proxy } = getCurrentInstance() as any
+
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  orderCode: '', // 委托书编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  deliverer: '', // 送样人
+  isUrgent: '', // 是否加急
+  status: '', // 接收状态
+  offset: 1,
+  limit: 20,
+})
+// 是否加急
+const isUrgentMap = [
+  { label: '全部', value: '0' },
+  { label: '是', value: '1' },
+  { label: '否', value: '2' },
+]
+// 接收状态
+const statusMap = [
+  { label: '全部', value: '0' },
+  { label: '已接收', value: '1' },
+  { label: '未接收', value: '2' },
+  { label: '已取消', value: '3' },
+]
+
+const columns = ref<TableColumn[]>([
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '样品数量', value: 'sampleQuantity', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '接收状态', value: 'status', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IOrderList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getInterChangeList(listQuery.value).then((response) => {
+  //   response.data.rows = [
+  //     {
+  //       id: 'test',
+  //       sampleNo: 'test', // 样品编号
+  //       sampleName: 'test', // 样品名称
+  //       sampleModel: 'test', // 型号
+  //       evaluationName: 'test', // 出厂编号
+  //       orderCode: 'test', // 委托书编号
+  //       customerId: 'test', // 委托方代码
+  //       customerName: 'test', // 委托方名称
+  //       deliverer: 'test', // 送检人
+  //       isUrgent: 'test', // 是否加急
+  //       sampleAttr: 'test', // 样品属性
+  //       planDeliverTime: 'test', // 预计送达时间
+  //     }]
+  //   list.value = response.data.rows.map((item: IinterchangeList) => {
+  //     return {
+  //       ...item,
+  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+  //     }
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      id: 'test',
+      orderCode: 'test', // 委托书编号
+      customerId: 'test', // 委托方代码
+      customerName: 'test', // 委托方名称
+      deliverer: 'test', // 送检人
+      delivererTel: 'test', // 送样人联系方式
+      sampleQuantity: 40, // 样品数量
+      isUrgent: '1', // 是否加急
+      status: 'test', // 接收状态
+      createTime: 'test', // 创建时间
+      remark: '备注',
+    },
+  ]
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    orderCode: '', // 委托书编号
+    customerId: '', // 委托方代码
+    customerName: '', // 委托方名称
+    deliverer: '', // 送样人
+    isUrgent: '', // 是否加急
+    status: '', // 接收状态
+    offset: 1,
+    limit: 20,
+  }
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IOrderList, type: string, title: string) => {
+  ElMessageBox.confirm(
+    `确认${title}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      if (type === 'receive') { // 接收
+        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+      else if (type === 'back') { // 退回
+        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      orderCode: '', // 委托书编号
+      customerId: '', // 委托方代码
+      customerName: '', // 委托方名称
+      deliverer: '', // 送样人
+      isUrgent: '', // 是否加急
+      status: '', // 接收状态
+      ids: checkoutList.value,
+    }
+    // exportInterchangeList(params).then((res) => {
+    //   const blob = new Blob([res.data])
+    //   exportFile(blob, '委托书列表.xlsx')
+    // })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+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: IOrderList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备收发列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  // todo: 校验文件类型，调用上传接口
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      // const fd = new FormData()
+      // fd.append('multipartFile', event.target.files[0])
+      // uploadApi(fd).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage.success('上传成功')
+      //   }
+      //   else {
+      //     ElMessage.error(res.message)
+      //   }
+      // })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+
+// 点击批量导入
+const uploadAll = () => {
+  fileRef.value.click()
+}
+
+// 点击编辑详情
+const goEdit = (row: IOrderList, type: string) => {
+
+}
+
+fetchData(true)
 </script>
 
 <template>
   <app-container>
-    委托书
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderCode"
+          placeholder="委托书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerId"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.deliverer"
+          placeholder="送样人"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in isUrgentMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in statusMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="170">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="goEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="goEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'receive', '接收')"
+              >
+                接收
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'back', '退回')"
+              >
+                退回
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
new file mode 100644
index 0000000..1d2c1bd
--- /dev/null
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -0,0 +1,27 @@
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+export interface IListQuery {
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送样人
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  offset: number
+  limit: number
+}
+
+// 表格
+export interface IOrderList {
+  id: string
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  sampleQuantity: number | string // 样品数量
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  createTime: string // 创建时间
+  remark: string // 备注
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 153b66e..c27e136 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,7 +13,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -603,7 +602,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -613,7 +612,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -623,6 +622,34 @@
                 />
               </el-form-item>
             </el-col>
+            <!-- <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 577779f..aa181ed 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -1,15 +1,14 @@
-<script setup lang="ts" name="ProcessSetting">
+<script setup lang="ts" name="Setting">
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineExpose, nextTick, onMounted, ref } from 'vue'
-import { useRoute } from 'vue-router'
 import useWorkFlowStore from '@/store/modules/workFlow'
 import errorDialog from '@/components/dialog/errorDialog.vue'
 import approverDrawer from '@/components/drawer/approverDrawer.vue'
 import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
 import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
-import { addProcess, editProcess, getDirectorLevel, getProcessDetail, unloadProcess } from '@/api/system/process'
+import { addProcess, editProcess, getDirectorLevel, getProcessDetail } from '@/api/system/process'
 import userStore from '@/store/modules/user'
-import type { ITipList } from '@/views/system/process/process'
+import type { ITipList, IworkFlowDef } from '@/views/system/process/process'
 const props = defineProps({
   allowEditNode: {
     type: Boolean,
@@ -30,14 +29,17 @@
 
 const user = userStore()
 const workFlowStore = useWorkFlowStore()
-const router = useRouter()
 const tipList = ref<ITipList[]>([]) // 统计空节点的数组
 const tipVisible = ref(false) // 控制提示空节点对话框显隐
 const nowVal = ref(100)
 const nodeConfig = ref({})
-const workFlowDef = ref({})
+const workFlowDef = ref<IworkFlowDef>({
+  name: '审批流程',
+})
 const flowPermission = ref([])
 const directorMaxLevel = ref(0)
+
+// 初始化--请求流程图详细信息
 const initDetail = async (formid: string) => {
   const res = await getProcessDetail(formid)
   return res.data
@@ -49,7 +51,7 @@
   getDirectorLevel(user.id).then((res) => {
     max = res.data.level
   })
-  const route = useRoute()
+  window.sessionStorage.setItem('maxLevel', `${max}`)
   nextTick(async () => {
     let data
     if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
@@ -59,7 +61,7 @@
       data = {
         tableId: 1,
         workFlowDef: {
-          name: '合同审批',
+          name: '审批流程',
         },
         directorMaxLevel: max,
         flowPermission: [],
@@ -81,19 +83,19 @@
         },
       }
     }
-    processConfig.value = data
+    processConfig.value = data // 流程设置
     const {
-      nodeConfig: nodes,
+      nodeConfig: nodes, // 节点设置
       flowPermission: flows, // 发起人
-      // directorMaxLevel: directors,
-      workFlowDef: works,
+      workFlowDef: works, // 流程基本信息
       tableId,
     } = data
-    nodeConfig.value = nodes
-    flowPermission.value = flows
-    // directorMaxLevel.value = directors
-    directorMaxLevel.value = max
-    workFlowDef.value = works
+    nodeConfig.value = nodes // 节点配置
+    flowPermission.value = flows // 发起人
+    directorMaxLevel.value = max // 用户主管最大层级数
+    workFlowDef.value = works // 流程基本信息
+    window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
+    window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
     workFlowStore.setTableId(tableId)
   })
 })
@@ -132,13 +134,12 @@
 // 保存流程图
 const saveSet = async () => {
   if (!props.isAddProcess) { // 编辑
-    processConfig.value.formId = props.getRowData.formId
+    processConfig.value.formId = props.getRowData.formId // 已有formid
     processConfig.value.formName = props.getRowData.formName
     processConfig.value.formDesc = props.getRowData.formDesc
     processConfig.value.formContent = props.getRowData.formDesc
     processConfig.value.workFlowDef.flowKey = props.getRowData.flowKey
     processConfig.value.workFlowDef.directorId = props.getRowData.directorId
-    processConfig.value.workFlowDef.name = props.getRowData.name
   }
   else { // 新建
     processConfig.value.formId = props.getRowData.formID
@@ -146,7 +147,15 @@
     processConfig.value.formDesc = props.getRowData.desc
     processConfig.value.formContent = props.getRowData.desc
     processConfig.value.workFlowDef.directorId = user.id
-    processConfig.value.workFlowDef.name = props.getRowData.name
+  }
+  processConfig.value.workFlowDef.name = props.getRowData.name // 流程名称
+  const decisionItem = window.sessionStorage.getItem('decisionItem')
+  const noticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (decisionItem) {
+    processConfig.value.workFlowDef.decisionItem = parseInt(decisionItem) // 可选决策项
+  }
+  if (noticeStarter) {
+    processConfig.value.workFlowDef.noticeStarter = parseInt(noticeStarter) // 审批结果通知发起人
   }
 
   workFlowStore.setIsTried(true)
@@ -163,9 +172,9 @@
         conditonCount += 1
       }
     })
-    workFlowStore.conditonErrorCount = conditonCount
-    workFlowStore.approverErrorCount = approverCount
-    tipVisible.value = true
+    workFlowStore.conditonErrorCount = conditonCount // 存入store
+    workFlowStore.approverErrorCount = approverCount // 存入store
+    tipVisible.value = true // 显示空节点提示框
     return
   }
 
@@ -188,11 +197,12 @@
       type: 1, // 成员
     }
 
-    const res = await addProcess(processConfig.value)
-    if (res.code == 200) {
+    addProcess(processConfig.value).then(() => {
       ElMessage.success('创建流程成功')
-      emits('createProcessSuccess')
-    }
+      emits('createProcessSuccess') // 返回列表页
+    }).catch(() => { // 流程异常情况: 所填写的formID已经存在
+      emits('createProcessSuccess') // 返回列表页
+    })
   }
   loading.close()
 }
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 2a22a79..660ac13 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -1,17 +1,15 @@
 <!-- 新建流程页面 -->
 <script lang="ts" setup name="EditProcess">
-import { onMounted, reactive, ref } from 'vue'
+import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
-import setting from '../../setting.vue'
-import type { IBusinessList, Iform } from './process'
+import Setting from '../../setting.vue'
+import type { Iform } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
-const $route = useRoute()
-const getRowData = ref({}) as any
 const ruleFormRef = ref<FormInstance>()
 const form: Ref<Iform> = ref({
   number: '', // 编号
@@ -19,55 +17,9 @@
   business: '', // 关联业务
   formID: '', // formID
   desc: '', // 流程描述
-  selectDecision: '', // 选择的决策
-  rejectTo: '', // 可驳回至
-  changeData: '', // 驳回修改数据
-  isMessage: '', // 审批结果通知发起人
 })
-// 可选决策项
-const decision = [
-  {
-    id: 'reject-refuse',
-    title: '同意 驳回 拒绝',
-  },
-  {
-    id: 'reject',
-    title: '同意 驳回',
-  },
-  {
-    id: 'refuse',
-    title: '同意 拒绝',
-  },
-]
-// 可驳回至
-const reject = [
-  {
-    id: 'change',
-    title: '单据修改',
-  },
-]
-// 驳回修改数据
-const rejectChangeData = [
-  {
-    id: 'all',
-    title: '重新按流程走',
-  },
-  {
-    id: 'part',
-    title: '送至驳回节点',
-  },
-]
-// 审批结果通知发起人
-const messageData = [
-  {
-    id: 'yes',
-    title: '是',
-  },
-  {
-    id: 'no',
-    title: '否',
-  },
-]
+
+// 表单校验
 const rules = reactive<FormRules>({
   name: [
     {
@@ -104,6 +56,7 @@
 const close = () => {
   $router.back()
 }
+
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -115,20 +68,7 @@
   })
 }
 
-// 选择决策项
-const changeDecision = (value: string) => {
-  form.value.selectDecision = value
-}
-const changeRejectTo = (value: string) => {
-  form.value.rejectTo = value
-}
-const changeData = (value: string) => {
-  form.value.changeData = value
-}
-const changeMessage = (value: string) => {
-  form.value.isMessage = value
-}
-
+// 监听流程组件--新建流程成功
 const createProcessSuccess = () => {
   close()
 }
@@ -152,42 +92,11 @@
               <el-form-item label="流程编号:">
                 <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
-              <!-- <el-form-item label="可选决策项" prop="selectDecision">
-                <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
-                  <el-option
-                    v-for="item in decision"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="流程名称:" prop="name">
                 <el-input v-model="form.name" placeholder="请输入流程名称" />
               </el-form-item>
-
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
-                <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
-                  <el-option
-                    v-for="item in reject"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
-              <!-- <el-form-item label="审批结果通知发起人" prop="isMessage">
-                <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
-                  <el-option
-                    v-for="item in messageData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="formID:" prop="formID">
@@ -198,16 +107,6 @@
               <el-form-item label="关联业务:" prop="business">
                 <el-input v-model="form.business" placeholder="请输入关联业务" />
               </el-form-item>
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
-                <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
-                  <el-option
-                    v-for="item in rejectChangeData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="16">
               <el-form-item label="流程描述" prop="desc">
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 26374ea..584d31e 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -17,55 +17,7 @@
   name: '', // 名称
   business: '', // 关联业务
   desc: '', // 流程描述
-  selectDecision: '同意 驳回 拒绝', // 选择的决策
-  rejectTo: '2', // 可驳回至
-  changeData: '2', // 驳回修改数据
-  isMessage: 'shi', // 审批结果通知发起人
 })
-// 可选决策项
-const decision = [
-  {
-    id: 'reject-refuse',
-    title: '同意 驳回 拒绝',
-  },
-  {
-    id: 'reject',
-    title: '同意 驳回',
-  },
-  {
-    id: 'refuse',
-    title: '同意 拒绝',
-  },
-]
-// 可驳回至
-const reject = [
-  {
-    id: 'change',
-    title: '单据修改',
-  },
-]
-// 驳回修改数据
-const rejectChangeData = [
-  {
-    id: 'all',
-    title: '重新按流程走',
-  },
-  {
-    id: 'part',
-    title: '送至驳回节点',
-  },
-]
-// 审批结果通知发起人
-const messageData = [
-  {
-    id: 'yes',
-    title: '是',
-  },
-  {
-    id: 'no',
-    title: '否',
-  },
-]
 const $router = useRouter()
 // 关闭
 const close = () => {
@@ -96,18 +48,7 @@
           <el-col :span="8">
             <el-form-item label="流程编号">
               <el-input v-model="form.number" disabled type="textarea" autosize />
-              <!-- {{ form.number }} -->
             </el-form-item>
-            <!-- <el-form-item label="可选决策项">
-              <el-select v-model="form.selectDecision" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in decision"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
             <el-form-item label="流程描述">
               <el-input v-model="form.desc" disabled type="textarea" autosize />
             </el-form-item>
@@ -115,47 +56,12 @@
           <el-col :span="8">
             <el-form-item label="流程名称">
               <el-input v-model="form.name" disabled />
-
-              <!-- {{ form.name }} -->
             </el-form-item>
-
-            <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至">
-              <el-select v-model="form.rejectTo" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in reject"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
-            <!-- <el-form-item label="审批结果通知发起人">
-              <el-select v-model="form.isMessage" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in messageData"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
           </el-col>
           <el-col :span="8">
             <el-form-item label="关联业务">
               <el-input v-model="form.business" disabled />
-
-              <!-- {{ form.business }} -->
             </el-form-item>
-            <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据">
-              <el-select v-model="form.changeData" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in rejectChangeData"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
           </el-col>
         </el-row>
       </el-form>
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index f1cdf25..5f10748 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -18,55 +18,7 @@
   name: '', // 名称
   business: '', // 关联业务
   desc: '', // 流程描述
-  selectDecision: '', // 选择的决策
-  rejectTo: '', // 可驳回至
-  changeData: '', // 驳回修改数据
-  isMessage: '', // 审批结果通知发起人
 })
-// 可选决策项
-const decision = [
-  {
-    id: 'reject-refuse',
-    title: '同意 驳回 拒绝',
-  },
-  {
-    id: 'reject',
-    title: '同意 驳回',
-  },
-  {
-    id: 'refuse',
-    title: '同意 拒绝',
-  },
-]
-// 可驳回至
-const reject = [
-  {
-    id: 'change',
-    title: '单据修改',
-  },
-]
-// 驳回修改数据
-const rejectChangeData = [
-  {
-    id: 'all',
-    title: '重新按流程走',
-  },
-  {
-    id: 'part',
-    title: '送至驳回节点',
-  },
-]
-// 审批结果通知发起人
-const messageData = [
-  {
-    id: 'yes',
-    title: '是',
-  },
-  {
-    id: 'no',
-    title: '否',
-  },
-]
 const rules = reactive<FormRules>({
   selectDecision: [
     {
@@ -101,8 +53,9 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  $router.push('/process/list')
+  $router.back()
 }
+
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -117,20 +70,6 @@
   })
 }
 
-// 选择决策项
-const changeDecision = (value: string) => {
-  form.value.selectDecision = value
-}
-const changeRejectTo = (value: string) => {
-  form.value.rejectTo = value
-}
-const changeData = (value: string) => {
-  form.value.changeData = value
-}
-const changeMessage = (value: string) => {
-  form.value.isMessage = value
-}
-
 onMounted(() => {
   const rowData: any = $route.query.rowData
   getRowData.value = JSON.parse(rowData)
@@ -158,19 +97,8 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="流程编号:">
-                <!-- {{ form.number }} -->
                 <el-input v-model="form.number" disabled type="textarea" autosize />
               </el-form-item>
-              <!-- <el-form-item label="可选决策项" prop="selectDecision">
-                <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
-                  <el-option
-                    v-for="item in decision"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
               <el-form-item label="流程描述">
                 <!-- <el-input v-model="form.desc" type="textarea" /> -->
                 <el-input v-model="form.desc" disabled type="textarea" autosize />
@@ -180,43 +108,11 @@
               <el-form-item label="流程名称:">
                 <el-input v-model="form.name" disabled />
               </el-form-item>
-
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
-                <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
-                  <el-option
-                    v-for="item in reject"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
-              <!-- <el-form-item label="审批结果通知发起人" prop="isMessage">
-                <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
-                  <el-option
-                    v-for="item in messageData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="关联业务:">
-                <!-- {{ form.business }} -->
                 <el-input v-model="form.business" disabled />
               </el-form-item>
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
-                <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
-                  <el-option
-                    v-for="item in rejectChangeData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
           </el-row>
         </el-form>
diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts
index d6a9b21..6ab1ed5 100644
--- a/src/views/system/process/process.ts
+++ b/src/views/system/process/process.ts
@@ -19,10 +19,6 @@
   business: string // 关联业务
   desc?: string // 流程描述
   formID?: string
-  selectDecision: string // 选择的决策
-  rejectTo?: string // 可驳回至
-  changeData?: string // 驳回修改数据
-  isMessage: string // 审批结果通知发起人
 }
 
 // 关联业务列表
@@ -35,4 +31,10 @@
   type: string
   name?: string
 }
+// 流程基本信息
+export interface IworkFlowDef {
+  name: string // 名称
+  decisionItem?: number | string // 可选决策项
+  noticeStarter?: number | string // 审批结果是否通知发起人
+}
 

diff --git a/src/api/business/order/order.ts b/src/api/business/order/order.ts
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/api/business/order/order.ts
diff --git a/src/api/business/schedule.ts b/src/api/business/schedule.ts
deleted file mode 100644
index f5b4569..0000000
--- a/src/api/business/schedule.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * 设备收发接口
-*/
-import request from '../index'
-import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
-const prefix = '/meter'
-
-// 列表查询
-export function getInterChangeList(data: IListQuery) {
-  return request({
-    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出列表
-export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
-  return request({
-    url: `${prefix}/schedule/interChange/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 根据样品id收入
-export function interchangeListTake(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/take`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id删除
-export function interchangeListDelete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id完成
-export function interchangeListComplete(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/complete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id回退
-export function interchangeListBack(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/back`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id归还
-export function interchangeListReturn(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/return`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id催办
-export function interchangeListUrge(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/urge`,
-    method: 'post',
-    data,
-  })
-}
-
-// 根据样品id终止
-export function interchangeListTerminate(data: { id: string; type: string }) {
-  return request({
-    url: `${prefix}/schedule/interChange/terminate`,
-    method: 'post',
-    data,
-  })
-}
-
diff --git a/src/api/business/schedule/interchangeList.ts b/src/api/business/schedule/interchangeList.ts
new file mode 100644
index 0000000..0dbb5af
--- /dev/null
+++ b/src/api/business/schedule/interchangeList.ts
@@ -0,0 +1,89 @@
+/**
+ * 设备收发接口
+*/
+import request from '../../index'
+import type { IListQuery } from '@/views/business/schedule/interchange/interchange_interface'
+const prefix = '/meter'
+
+// 列表查询
+export function getInterChangeList(data: IListQuery) {
+  return request({
+    url: `${prefix}/schedule/interChange/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出列表
+export function exportInterchangeList(data: Omit<IListQuery, 'limit' | 'offset'>) {
+  return request({
+    url: `${prefix}/schedule/interChange/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 根据样品id收入
+export function interchangeListTake(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/take`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id删除
+export function interchangeListDelete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id完成
+export function interchangeListComplete(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/complete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id回退
+export function interchangeListBack(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/back`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id归还
+export function interchangeListReturn(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/return`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id催办
+export function interchangeListUrge(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/urge`,
+    method: 'post',
+    data,
+  })
+}
+
+// 根据样品id终止
+export function interchangeListTerminate(data: { id: string; type: string }) {
+  return request({
+    url: `${prefix}/schedule/interChange/terminate`,
+    method: 'post',
+    data,
+  })
+}
+
diff --git a/src/components/dialog/errorDialog.vue b/src/components/dialog/errorDialog.vue
index 7f0ad97..9df37f5 100644
--- a/src/components/dialog/errorDialog.vue
+++ b/src/components/dialog/errorDialog.vue
@@ -1,3 +1,4 @@
+<!-- 空节点提示（红色感叹号） -->
 <script setup lang="ts" name="ErrorDialog">
 import { computed } from 'vue'
 import useWorkFlowStore from '@/store/modules/workFlow'
@@ -25,6 +26,7 @@
   },
 })
 
+// 点击去修改
 const doAfter = () => {
   emits('changeTipVisible', false)
 }
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
index 636e03d..9a87d4b 100644
--- a/src/components/dialog/selectRoleDialog.vue
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -56,7 +56,7 @@
   get() {
     return props.visible
   },
-  set(val) {
+  set() {
     closeDialog()
   },
 })
@@ -69,10 +69,9 @@
   const checkedList = multipleTable.value.map((item: any) => ({
     ...item,
     type: 2, // type：1.成员，2.角色
-    // targetId: item.roleId,
-    // name: item.roleName,
     targetId: item.id,
   }))
+
   emits('change', checkedList)
 }
 
@@ -132,7 +131,6 @@
           :data="roleList"
           row-key="id"
           :border="false"
-          :check-strictly="true"
           style="width: 100%;"
           :default-expand-all="true"
           :tree-props="{ children: 'children' }"
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 2e631a6..97d7326 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -29,6 +29,10 @@
   setApprover(false)
 }
 
+const disabledVal = window.sessionStorage.getItem('maxLevel') // 上级主管层级
+const decisionItem = ref(1) // 可选决策项
+const noticeStarter = ref(1) // 审批结果通知发起人
+
 const visible = computed({
   get() {
     return workFlowStore.approverDrawer
@@ -72,6 +76,8 @@
 }
 // 点击确定，保存审批设置
 const saveApprover = () => {
+  window.sessionStorage.setItem('decisionItem', `${decisionItem.value}`)
+  window.sessionStorage.setItem('noticeStarter', `${noticeStarter.value}`)
   approverConfig.value.examineMode = approverConfig.value.tempExamineMode
   // 成员
   if (approverConfig.value.settype === 1) {
@@ -146,6 +152,17 @@
   emits('update:nodeConfig', approverConfig.value)
   closeDrawer()
 }
+
+onMounted(() => {
+  const getDecisionItem = window.sessionStorage.getItem('decisionItem')
+  const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (getDecisionItem) {
+    decisionItem.value = parseInt(getDecisionItem) // 可选决策项
+  }
+  if (getNoticeStarter) {
+    noticeStarter.value = parseInt(getNoticeStarter) // 审批结果通知发起人
+  }
+})
 </script>
 
 <template>
@@ -161,10 +178,10 @@
         <el-radio :label="11">
           指定角色
         </el-radio>
-        <el-radio :label="2">
+        <el-radio :label="2" :disabled="disabledVal === '0'">
           主管
         </el-radio>
-        <el-radio :label="7">
+        <el-radio :label="7" :disabled="disabledVal === '0'">
           连续多级主管
         </el-radio>
       </el-radio-group>
@@ -185,8 +202,11 @@
       <el-button v-if="approverConfig.settype === 11" type="primary" @click="addRoleApprover">
         <!-- 添加/修改角色 -->选择角色
       </el-button>
+
       <!-- 分界线 -->
       <div style="width: 100%;height: 1px;margin: 20px 0;background-color: #f2f2f2;" />
+
+      <!-- 主管 -->
       <div v-if="approverConfig.settype === 2" class="add-person">
         <p style="margin-bottom: 32px;">
           <span>发起人的：</span>
@@ -247,6 +267,35 @@
         </el-radio>
       </el-radio-group>
 
+      <!-- 可选决策项 -->
+      <h5 class="add-person">
+        可选决策项
+      </h5>
+      <el-radio-group v-model="decisionItem" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          同意、驳回、拒绝
+        </el-radio>
+        <el-radio :label="2">
+          同意、驳回
+        </el-radio>
+        <el-radio :label="3">
+          拒绝
+        </el-radio>
+      </el-radio-group>
+
+      <!-- 审批结果通知发起人 -->
+      <h5 class="add-person">
+        审批结果通知发起人
+      </h5>
+      <el-radio-group v-model="noticeStarter" style="width: 100%;margin-bottom: 16px;">
+        <el-radio :label="1">
+          是
+        </el-radio>
+        <el-radio :label="0">
+          否
+        </el-radio>
+      </el-radio-group>
+
       <!-- 底部确定取消按钮 -->
       <div class="demo-drawer__footer clear" style="margin-top: 50px;">
         <el-button type="primary" @click="saveApprover">
diff --git a/src/components/drawer/conditionDrawer.vue b/src/components/drawer/conditionDrawer.vue
index 0f7424d..e93a591 100644
--- a/src/components/drawer/conditionDrawer.vue
+++ b/src/components/drawer/conditionDrawer.vue
@@ -37,15 +37,7 @@
     ? conditionsConfig.value.conditionNodes[val.priorityLevel - 1]
     : { nodeUserList: [], conditionList: [] }
 })
-const changeOptType = (item) => {
-  if (item.optType === 1) {
-    item.zdy1 = 2
-  }
-  else {
-    item.zdy1 = 1
-    item.zdy2 = 2
-  }
-}
+
 const removeStrEle = (item, key) => {
   const a = item.zdy1 ? item.zdy1.split(',') : []
   let includesIndex
@@ -69,6 +61,7 @@
   }
 }
 
+// 添加条件
 const addCondition = async () => {
   conditionList.value = []
   conditionVisible.value = true
@@ -111,9 +104,9 @@
     }
   }
 }
+
+// 点击确定--抽屉添加条件条件
 const sureCondition = () => {
-  console.log('*****')
-  console.log(conditionConfig.value)
   // 1.弹窗有，外面无+
   // 2.弹窗有，外面有不变
   for (let i = 0; i < conditionList.value.length; i++) {
@@ -168,7 +161,8 @@
   conditionConfig.value.conditionList.sort((a, b) => { return a.columnId - b.columnId })
   conditionVisible.value = false
 }
-// 抽屉点击确定
+
+// 抽屉点击确定--保存条件
 const saveCondition = () => {
   closeDrawer()
   const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1)// 截取旧下标
@@ -186,7 +180,7 @@
     id: workFlowStore.conditionsConfig1.id,
   })
 }
-// 添加
+// 添加条件--人员
 const addConditionRole = () => {
   conditionRoleVisible.value = true
   checkedList.value = conditionConfig.value.nodeUserList
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 199c3f5..e28e29b 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts" name="AddNode">
 import { ref } from 'vue'
-import useWorkFlowStore from '@/store/modules/workFlow'
+// import useWorkFlowStore from '@/store/modules/workFlow'
 
 const props = defineProps({
   childNodeP: {
@@ -9,13 +9,15 @@
   },
 })
 const emits = defineEmits(['update:childNodeP'])
-const workFlowStore = useWorkFlowStore()
-const visible = ref(false)
+// const workFlowStore = useWorkFlowStore()
+const visible = ref(false) // 对话框显隐
+
+// 添加节点
 const addType = (type: number) => {
   visible.value = false
   if (type != 4) {
     let data
-    if (type == 1) {
+    if (type == 1) { // 审核
       data = {
         nodeName: '审核人',
         error: true,
@@ -31,7 +33,7 @@
         nodeUserList: [],
       }
     }
-    else if (type == 2) {
+    else if (type == 2) { // 抄送
       data = {
         nodeName: '抄送人',
         type: 2,
@@ -43,7 +45,7 @@
     emits('update:childNodeP', data)
   }
   else {
-    emits('update:childNodeP', {
+    emits('update:childNodeP', { // 条件
       nodeName: '路由',
       type: 4,
       childNode: null,
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index 53e008c..9cd1d79 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -21,29 +21,31 @@
 const workFlowStore = useWorkFlowStore()
 const proxy = getCurrentInstance() as any
 const _uid = proxy.uid
-const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-const placeholderList = ['发起人', '审核人', '抄送人']
-const defaultText = computed(() => {
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250'] // 节点颜色
+const placeholderList = ['发起人', '审核人', '抄送人'] // 节点默认名字
+const defaultText = computed(() => { // 默认节点名字
   return placeholderList[props.nodeConfig.type]
 })
+// 节点内容--处理节点里的文字
 const showText = computed(() => {
   console.log('showText')
   if (props.nodeConfig.type == 0) { // 发起人
     // return userStore.name
     // return $func.arrToStr(props.flowPermission) || userStore.name
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
   return $func.copyerStr(props.nodeConfig) // 抄送
 })
-watch(() => props.nodeConfig, (val) => {
+watch(() => props.nodeConfig, () => {
   console.log('watch nodeConfig')
-  if (props.nodeConfig.type == 1) {
+  if (props.nodeConfig.type == 1) { // 审批
     return $func.setApproverStr(props.nodeConfig)
   }
-  return $func.copyerStr(props.nodeConfig)
+  return $func.copyerStr(props.nodeConfig) // 抄送
 }, {
   deep: true, // 深度监听的参数
 })
@@ -95,15 +97,15 @@
 // })
 
 const {
-  setPromoter,
   setApprover,
   setCopyer,
   setCondition,
-  setFlowPermission,
   setApproverConfig,
   setCopyerConfig,
   setConditionsConfig,
 } = workFlowStore
+
+// 点击节点名称--显示输入框（条件会有index）
 const clickEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = true
@@ -112,6 +114,7 @@
     isInput.value = true
   }
 }
+// 节点名称失去焦点--保存名称
 const blurEvent = (index: number | string | null) => {
   if (index || index === 0) {
     isInputList.value[index] = false
@@ -122,11 +125,13 @@
     props.nodeConfig.nodeName = props.nodeConfig.nodeName || defaultText
   }
 }
-// 删除节点
+
+// 删除节点--（审批、抄送）
 const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
-// 添加条件
+
+// 点击添加条件
 const addTerm = () => {
   const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
@@ -137,7 +142,7 @@
     nodeUserList: [],
     childNode: null,
   })
-  resetConditionNodesErr()
+  resetConditionNodesErr() // 检查空节点
   emits('update:nodeConfig', props.nodeConfig)
 }
 const reData = (data: any, addData: any) => {
@@ -148,6 +153,7 @@
     reData(data.childNode, addData)
   }
 }
+// 删除条件设置
 const delTerm = (index: number) => {
   props.nodeConfig.conditionNodes.splice(index, 1)
   props.nodeConfig.conditionNodes.map((item: any, index: number) => {
@@ -156,6 +162,7 @@
   })
   resetConditionNodesErr()
   emits('update:nodeConfig', props.nodeConfig)
+  // 删除条件如果只剩一个条件，将剩余条件删除，并删除加号
   if (props.nodeConfig.conditionNodes.length == 1) {
     if (props.nodeConfig.childNode) {
       if (props.nodeConfig.conditionNodes[0].childNode) {
@@ -169,20 +176,13 @@
   }
 }
 
+// 点击节点--节点设置
 const setPerson = (priorityLevel: any) => {
-  const { type } = props.nodeConfig
-  if (type == 0) { // 发起人
-    // setPromoter(true)
-    // setFlowPermission({
-    //   value: props.flowPermission,
-    //   flag: false,
-    //   id: _uid,
-    // })
-  }
-  else if (type == 1) { // 审批
-    const { approverConfig1, approverDrawer } = workFlowStore
-    setApprover(true)
-    setApproverConfig({
+  const { type } = props.nodeConfig // 节点类型
+  if (type == 1) { // 审批
+    // const { approverConfig1, approverDrawer } = workFlowStore
+    setApprover(true) // drawer
+    setApproverConfig({ // 节点数据设置
       value: {
         ...JSON.parse(JSON.stringify(props.nodeConfig)),
         ...{ settype: props.nodeConfig.settype ? props.nodeConfig.settype : 1 },
@@ -209,6 +209,7 @@
     })
   }
 }
+// 条件左右切换
 const arrTransfer = (index: number, type = 1) => {
   // 向左-1,向右1
   props.nodeConfig.conditionNodes[index] = props.nodeConfig.conditionNodes.splice(
diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue
index 457d9ab..15d9957 100644
--- a/src/components/workFlow/nodeWrapBan.vue
+++ b/src/components/workFlow/nodeWrapBan.vue
@@ -29,7 +29,8 @@
     console.log('pppppppp')
     console.log(props.flowPermission)
     // return $func.arrToStr(props.flowPermission) || '所有人'
-    return props.flowPermission.name || userStore.name
+    // return props.flowPermission.name || userStore.name
+    return '所有人'
   }
   if (props.nodeConfig.type == 1) {
     return $func.setApproverStr(props.nodeConfig) // 审批
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index e0c98f7..a58f41e 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -25,31 +25,6 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig: any) {
-    // let tempValue = '会签'
-    // let strPeople = ' '
-    // if (nodeConfig.selectCustomApprovalType === 'huoqian') {
-    //   tempValue = '或签'
-    // }
-    // if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-    // else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
-    //   let strPeople = ' '
-    //   if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
-    //     strPeople = `由${nodeConfig.nodeUserList[0].name}负责(逐级审批)`
-    //   }
-    //   else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
-    //     strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}负责（逐级审批-${tempValue}）`
-    //   }
-    //   return strPeople
-    // }
-
     if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
       if (nodeConfig.nodeUserList.length == 1) {
         return nodeConfig.nodeUserList[0].name
@@ -83,7 +58,7 @@
     const arr = []
     const list = str.split(',')
     for (var elem in obj) {
-      list.map((item) => {
+      list.map((item: any) => {
         if (item == elem) {
           arr.push(obj[elem].value)
         }
@@ -118,11 +93,6 @@
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
-    // else {
-    //   if (nodeConfig.ccSelfSelectFlag == 1) {
-    //     return '发起人自选'
-    //   }
-    // }
   },
   toggleStrClass(item: any, key: any) {
     const a = item.zdy1 ? item.zdy1.split(',') : []
diff --git a/src/views/business/schedule/interchange/interchangeEdit.vue b/src/views/business/schedule/interchange/interchangeEdit.vue
index be7f8bd..734f146 100644
--- a/src/views/business/schedule/interchange/interchangeEdit.vue
+++ b/src/views/business/schedule/interchange/interchangeEdit.vue
@@ -4,7 +4,6 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadUserFile } from 'element-plus'
 import { ref } from 'vue'
-import { Calendar, Search } from '@element-plus/icons-vue'
 import type { ISampleDetail, Menu, SimpleCertification, SimpleMeasureRecord } from './interchange_interface'
 import sampleDialog from '@/views/customer/sample/list/sampleDialog.vue'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
@@ -13,7 +12,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -300,26 +298,14 @@
           type: 'warning',
         },
       ).then(() => {
-        if (dataForm.value.id) {
-          updateSample(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)
-            }
-          })
-        }
-        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)
-            }
-          })
-        }
+        updateSample(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)
+          }
+        })
       })
     }
   })
@@ -604,7 +590,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -614,7 +600,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -625,6 +611,34 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
                   v-model="dataForm.mesureType"
diff --git a/src/views/business/schedule/interchange/interchangeList.vue b/src/views/business/schedule/interchange/interchangeList.vue
index 74e0a67..759e08a 100644
--- a/src/views/business/schedule/interchange/interchangeList.vue
+++ b/src/views/business/schedule/interchange/interchangeList.vue
@@ -16,8 +16,9 @@
   interchangeListTake,
   interchangeListTerminate,
   interchangeListUrge,
-} from '@/api/business/schedule'
+} from '@/api/business/schedule/interchangeList'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
@@ -64,7 +65,7 @@
   { text: '委托方代码', value: 'customerId', align: 'center' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '送检人', value: 'deliverer', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '预计送达时间', value: 'planDeliverTime', align: 'center' },
 ])
@@ -79,7 +80,7 @@
   { text: '委托方名称', value: 'customerName', align: 'center' },
   { text: '实际送达时间', value: 'deliverTime', align: 'center' },
   { text: '要求检完时间', value: 'requireOverTime', align: 'center' },
-  { text: '是否加急', value: 'isUrgent', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IinterchangeList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IinterchangeList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
   { text: '样品属性', value: 'sampleAttr', align: 'center' },
   { text: '当前检定环节', value: 'currentDeliver', align: 'center' },
   { text: '证书出具', value: 'Certifications', align: 'center' },
@@ -139,7 +140,7 @@
       customerId: 'test', // 委托方代码
       customerName: 'test', // 委托方名称
       deliverer: 'test', // 送检人
-      isUrgent: '2', // 是否加急
+      isUrgent: '1', // 是否加急
       sampleAttr: '1', // 样品属性
       planDeliverTime: 'test', // 预计送达时间
       deliverTime: 'test', // 实际送达时间
@@ -151,7 +152,6 @@
     return {
       ...item,
       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
-      isUrgent: `${item.isUrgent}` === '1' ? '是' : '否',
       sampleAttr: `${item.sampleAttr}` === '1' ? '客户样品' : '自有设备',
     }
   })
@@ -452,7 +452,7 @@
         :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
       >
         <template #columns>
-          <el-table-column label="操作" align="center" fixed="right" width="220">
+          <el-table-column label="操作" align="center" fixed="right" width="240">
             <template #default="{ row }">
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/edit') && currentMenu === 'taking'"
@@ -496,7 +496,7 @@
                 type="danger"
                 @click="handleEdit(row, 'delete', '删除')"
               >
-                删除
+                无需检测
               </el-button>
               <el-button
                 v-if="proxy.hasPerm('/schedule/interchangeList/complete') && currentMenu === 'took'"
diff --git a/src/views/business/schedule/order/orderList.vue b/src/views/business/schedule/order/orderList.vue
index e8b9bfc..60c292d 100644
--- a/src/views/business/schedule/order/orderList.vue
+++ b/src/views/business/schedule/order/orderList.vue
@@ -1,10 +1,378 @@
 <script lang="ts" setup name="OrderList">
-// 委托书
+import type { Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IListQuery, IOrderList } from './orderList_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
+
+const { proxy } = getCurrentInstance() as any
+
+// 查询条件
+const listQuery: Ref<IListQuery> = ref({
+  orderCode: '', // 委托书编号
+  customerId: '', // 委托方代码
+  customerName: '', // 委托方名称
+  deliverer: '', // 送样人
+  isUrgent: '', // 是否加急
+  status: '', // 接收状态
+  offset: 1,
+  limit: 20,
+})
+// 是否加急
+const isUrgentMap = [
+  { label: '全部', value: '0' },
+  { label: '是', value: '1' },
+  { label: '否', value: '2' },
+]
+// 接收状态
+const statusMap = [
+  { label: '全部', value: '0' },
+  { label: '已接收', value: '1' },
+  { label: '未接收', value: '2' },
+  { label: '已取消', value: '3' },
+]
+
+const columns = ref<TableColumn[]>([
+  { text: '委托书编号', value: 'orderCode', align: 'center' },
+  { text: '委托方代码', value: 'customerId', align: 'center' },
+  { text: '委托方名称', value: 'customerName', align: 'center' },
+  { text: '送样人', value: 'deliverer', align: 'center' },
+  { text: '联系方式', value: 'delivererTel', align: 'center' },
+  { text: '样品数量', value: 'sampleQuantity', align: 'center' },
+  { text: '是否加急', value: 'isUrgent', align: 'center', width: '55px', filter: (row: IOrderList) => { return row.isUrgent == '1' ? '是' : '否' }, styleFilter: (row: IOrderList) => { return row.isUrgent == '1' ? 'color: red' : '' } },
+  { text: '接收状态', value: 'status', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+
+// 表格数据
+const list = ref<IOrderList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  // loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  // getInterChangeList(listQuery.value).then((response) => {
+  //   response.data.rows = [
+  //     {
+  //       id: 'test',
+  //       sampleNo: 'test', // 样品编号
+  //       sampleName: 'test', // 样品名称
+  //       sampleModel: 'test', // 型号
+  //       evaluationName: 'test', // 出厂编号
+  //       orderCode: 'test', // 委托书编号
+  //       customerId: 'test', // 委托方代码
+  //       customerName: 'test', // 委托方名称
+  //       deliverer: 'test', // 送检人
+  //       isUrgent: 'test', // 是否加急
+  //       sampleAttr: 'test', // 样品属性
+  //       planDeliverTime: 'test', // 预计送达时间
+  //     }]
+  //   list.value = response.data.rows.map((item: IinterchangeList) => {
+  //     return {
+  //       ...item,
+  //       Certifications: item.currentCertifications === item.requireCertifications ? item.requireCertifications : (`${item.currentCertifications}/${item.requireCertifications}`),
+  //     }
+  //   })
+  //   total.value = parseInt(response.data.total)
+  //   loadingTable.value = false
+  // })
+  list.value = [
+    {
+      id: 'test',
+      orderCode: 'test', // 委托书编号
+      customerId: 'test', // 委托方代码
+      customerName: 'test', // 委托方名称
+      deliverer: 'test', // 送检人
+      delivererTel: 'test', // 送样人联系方式
+      sampleQuantity: 40, // 样品数量
+      isUrgent: '1', // 是否加急
+      status: 'test', // 接收状态
+      createTime: 'test', // 创建时间
+      remark: '备注',
+    },
+  ]
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    orderCode: '', // 委托书编号
+    customerId: '', // 委托方代码
+    customerName: '', // 委托方名称
+    deliverer: '', // 送样人
+    isUrgent: '', // 是否加急
+    status: '', // 接收状态
+    offset: 1,
+    limit: 20,
+  }
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  fetchData(true)
+}
+
+// 操作
+const handleEdit = (row: IOrderList, type: string, title: string) => {
+  ElMessageBox.confirm(
+    `确认${title}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      if (type === 'receive') { // 接收
+        // interchangeListTake({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+      else if (type === 'back') { // 退回
+        // interchangeListDelete({ id: row.sampleNo, type: currentMenu.value }).then((res) => {
+        //   if (res.code === 200) {
+        //     ElMessage({
+        //       type: 'success',
+        //       message: `已${title}`,
+        //     })
+        //     fetchData(true)
+        //   }
+        // })
+      }
+    })
+}
+
+// 导出
+const exportAll = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  if (list.value.length > 0) {
+    const params = {
+      orderCode: '', // 委托书编号
+      customerId: '', // 委托方代码
+      customerName: '', // 委托方名称
+      deliverer: '', // 送样人
+      isUrgent: '', // 是否加急
+      status: '', // 接收状态
+      ids: checkoutList.value,
+    }
+    // exportInterchangeList(params).then((res) => {
+    //   const blob = new Blob([res.data])
+    //   exportFile(blob, '委托书列表.xlsx')
+    // })
+  }
+  else {
+    ElMessage.warning('无数据可导出数据')
+  }
+  loading.close()
+}
+
+// 打印列表
+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: IOrderList) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '设备收发列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+// 模板下载
+const templateDownload = () => {
+
+}
+
+// 上传文件/批量导入
+const onFileChange = (event: any) => {
+  // todo: 校验文件类型，调用上传接口
+  if (event.target.files[0].type === 'application/pdf') {
+    if (event.target.files?.length !== 0) {
+      // 创建formdata对象
+      // const fd = new FormData()
+      // fd.append('multipartFile', event.target.files[0])
+      // uploadApi(fd).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage.success('上传成功')
+      //   }
+      //   else {
+      //     ElMessage.error(res.message)
+      //   }
+      // })
+    }
+  }
+  else {
+    ElMessage.error('请上传pdf格式')
+  }
+}
+
+// 点击批量导入
+const uploadAll = () => {
+  fileRef.value.click()
+}
+
+// 点击编辑详情
+const goEdit = (row: IOrderList, type: string) => {
+
+}
+
+fetchData(true)
 </script>
 
 <template>
   <app-container>
-    委托书
+    <search-area
+      :need-clear="true"
+      @search="searchList" @clear="clearList"
+    >
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.orderCode"
+          placeholder="委托书编号"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.customerId"
+          placeholder="委托方代码"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.deliverer"
+          placeholder="送样人"
+          class="short-input"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.isUrgent" placeholder="是否加急" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in isUrgentMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.status" placeholder="接收状态" style="width: 120px;" clearable>
+          <el-option
+            v-for="item in statusMap"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-import" title="批量导入" type="primary" @click="uploadAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/import')" icon="icon-template" title="模板下载" type="primary" @click="templateDownload" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+        <icon-button v-if="proxy.hasPerm('/schedule/orderList/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+      </template>
+      <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+      >
+        <template #columns>
+          <el-table-column label="操作" align="center" fixed="right" width="170">
+            <template #default="{ row }">
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/edit')"
+                size="small"
+                type="primary"
+                link
+                @click="goEdit(row, 'edit')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="small"
+                link
+                type="primary"
+                @click="goEdit(row, 'detail')"
+              >
+                详情
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/receive')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'receive', '接收')"
+              >
+                接收
+              </el-button>
+              <el-button
+                v-if="proxy.hasPerm('/schedule/orderList/back')"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'back', '退回')"
+              >
+                退回
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
   </app-container>
 </template>
 
diff --git a/src/views/business/schedule/order/orderList_interface.ts b/src/views/business/schedule/order/orderList_interface.ts
new file mode 100644
index 0000000..1d2c1bd
--- /dev/null
+++ b/src/views/business/schedule/order/orderList_interface.ts
@@ -0,0 +1,27 @@
+// import type { TableColumn } from '@/components/NormalTable/table_interface'
+
+export interface IListQuery {
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送样人
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  offset: number
+  limit: number
+}
+
+// 表格
+export interface IOrderList {
+  id: string
+  orderCode: string // 委托书编号
+  customerId: string // 委托方代码
+  customerName: string // 委托方名称
+  deliverer: string // 送检人
+  delivererTel: string // 送样人联系方式
+  sampleQuantity: number | string // 样品数量
+  isUrgent: string // 是否加急
+  status: string // 接收状态
+  createTime: string // 创建时间
+  remark: string // 备注
+}
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index 153b66e..c27e136 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -13,7 +13,6 @@
 import { addSample, getSapmleDetail, updateSample } from '@/api/customer/sampleList'
 import countries from '@/components/AddressSelect/country-code.json'
 import { UploadFile } from '@/api/measure/file'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { ICustomer } from '@/views/customer/customerInfo/customer_interface'
 
 const textMap: { [key: string]: string } = {
@@ -603,7 +602,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="送检人:">
                 <el-input
                   v-model="dataForm.deliverer"
@@ -613,7 +612,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-if="pageType === 'detail'" :span="6">
+            <el-col v-if="pageType !== 'add'" :span="6">
               <el-form-item label="联系方式:">
                 <el-input
                   v-model="dataForm.delivererTel"
@@ -623,6 +622,34 @@
                 />
               </el-form-item>
             </el-col>
+            <!-- <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="预计送达时间:">
+                <el-date-picker
+                  v-model="dataForm.planDeliverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入预计送达时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col v-if="pageType !== 'add'" :span="6">
+              <el-form-item label="要求检完时间:">
+                <el-date-picker
+                  v-model="dataForm.requireOverTime"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="pageType === 'detail' ? '' : '请输入要求检完时间'"
+                  :class="{ 'detail-input': pageType === 'detail' }"
+                  :disabled="pageType === 'detail'"
+                />
+              </el-form-item>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="检定方式:">
                 <el-select
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 577779f..aa181ed 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -1,15 +1,14 @@
-<script setup lang="ts" name="ProcessSetting">
+<script setup lang="ts" name="Setting">
 import { ElLoading, ElMessage } from 'element-plus'
 import { defineExpose, nextTick, onMounted, ref } from 'vue'
-import { useRoute } from 'vue-router'
 import useWorkFlowStore from '@/store/modules/workFlow'
 import errorDialog from '@/components/dialog/errorDialog.vue'
 import approverDrawer from '@/components/drawer/approverDrawer.vue'
 import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
 import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
-import { addProcess, editProcess, getDirectorLevel, getProcessDetail, unloadProcess } from '@/api/system/process'
+import { addProcess, editProcess, getDirectorLevel, getProcessDetail } from '@/api/system/process'
 import userStore from '@/store/modules/user'
-import type { ITipList } from '@/views/system/process/process'
+import type { ITipList, IworkFlowDef } from '@/views/system/process/process'
 const props = defineProps({
   allowEditNode: {
     type: Boolean,
@@ -30,14 +29,17 @@
 
 const user = userStore()
 const workFlowStore = useWorkFlowStore()
-const router = useRouter()
 const tipList = ref<ITipList[]>([]) // 统计空节点的数组
 const tipVisible = ref(false) // 控制提示空节点对话框显隐
 const nowVal = ref(100)
 const nodeConfig = ref({})
-const workFlowDef = ref({})
+const workFlowDef = ref<IworkFlowDef>({
+  name: '审批流程',
+})
 const flowPermission = ref([])
 const directorMaxLevel = ref(0)
+
+// 初始化--请求流程图详细信息
 const initDetail = async (formid: string) => {
   const res = await getProcessDetail(formid)
   return res.data
@@ -49,7 +51,7 @@
   getDirectorLevel(user.id).then((res) => {
     max = res.data.level
   })
-  const route = useRoute()
+  window.sessionStorage.setItem('maxLevel', `${max}`)
   nextTick(async () => {
     let data
     if (!props.isAddProcess && props.selectFormId) { // 非新建流程--调流程详情接口
@@ -59,7 +61,7 @@
       data = {
         tableId: 1,
         workFlowDef: {
-          name: '合同审批',
+          name: '审批流程',
         },
         directorMaxLevel: max,
         flowPermission: [],
@@ -81,19 +83,19 @@
         },
       }
     }
-    processConfig.value = data
+    processConfig.value = data // 流程设置
     const {
-      nodeConfig: nodes,
+      nodeConfig: nodes, // 节点设置
       flowPermission: flows, // 发起人
-      // directorMaxLevel: directors,
-      workFlowDef: works,
+      workFlowDef: works, // 流程基本信息
       tableId,
     } = data
-    nodeConfig.value = nodes
-    flowPermission.value = flows
-    // directorMaxLevel.value = directors
-    directorMaxLevel.value = max
-    workFlowDef.value = works
+    nodeConfig.value = nodes // 节点配置
+    flowPermission.value = flows // 发起人
+    directorMaxLevel.value = max // 用户主管最大层级数
+    workFlowDef.value = works // 流程基本信息
+    window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
+    window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
     workFlowStore.setTableId(tableId)
   })
 })
@@ -132,13 +134,12 @@
 // 保存流程图
 const saveSet = async () => {
   if (!props.isAddProcess) { // 编辑
-    processConfig.value.formId = props.getRowData.formId
+    processConfig.value.formId = props.getRowData.formId // 已有formid
     processConfig.value.formName = props.getRowData.formName
     processConfig.value.formDesc = props.getRowData.formDesc
     processConfig.value.formContent = props.getRowData.formDesc
     processConfig.value.workFlowDef.flowKey = props.getRowData.flowKey
     processConfig.value.workFlowDef.directorId = props.getRowData.directorId
-    processConfig.value.workFlowDef.name = props.getRowData.name
   }
   else { // 新建
     processConfig.value.formId = props.getRowData.formID
@@ -146,7 +147,15 @@
     processConfig.value.formDesc = props.getRowData.desc
     processConfig.value.formContent = props.getRowData.desc
     processConfig.value.workFlowDef.directorId = user.id
-    processConfig.value.workFlowDef.name = props.getRowData.name
+  }
+  processConfig.value.workFlowDef.name = props.getRowData.name // 流程名称
+  const decisionItem = window.sessionStorage.getItem('decisionItem')
+  const noticeStarter = window.sessionStorage.getItem('noticeStarter')
+  if (decisionItem) {
+    processConfig.value.workFlowDef.decisionItem = parseInt(decisionItem) // 可选决策项
+  }
+  if (noticeStarter) {
+    processConfig.value.workFlowDef.noticeStarter = parseInt(noticeStarter) // 审批结果通知发起人
   }
 
   workFlowStore.setIsTried(true)
@@ -163,9 +172,9 @@
         conditonCount += 1
       }
     })
-    workFlowStore.conditonErrorCount = conditonCount
-    workFlowStore.approverErrorCount = approverCount
-    tipVisible.value = true
+    workFlowStore.conditonErrorCount = conditonCount // 存入store
+    workFlowStore.approverErrorCount = approverCount // 存入store
+    tipVisible.value = true // 显示空节点提示框
     return
   }
 
@@ -188,11 +197,12 @@
       type: 1, // 成员
     }
 
-    const res = await addProcess(processConfig.value)
-    if (res.code == 200) {
+    addProcess(processConfig.value).then(() => {
       ElMessage.success('创建流程成功')
-      emits('createProcessSuccess')
-    }
+      emits('createProcessSuccess') // 返回列表页
+    }).catch(() => { // 流程异常情况: 所填写的formID已经存在
+      emits('createProcessSuccess') // 返回列表页
+    })
   }
   loading.close()
 }
diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue
index 2a22a79..660ac13 100644
--- a/src/views/system/process/addProcess.vue
+++ b/src/views/system/process/addProcess.vue
@@ -1,17 +1,15 @@
 <!-- 新建流程页面 -->
 <script lang="ts" setup name="EditProcess">
-import { onMounted, reactive, ref } from 'vue'
+import { reactive, ref } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import type { Ref } from 'vue'
-import setting from '../../setting.vue'
-import type { IBusinessList, Iform } from './process'
+import Setting from '../../setting.vue'
+import type { Iform } from './process'
 import WorkFlow from '@/components/workFlow/workFlow.vue'
 const emits = defineEmits(['close'])
 const processSetting = ref()
 const selectFormId = ref('') // formid
-const $route = useRoute()
-const getRowData = ref({}) as any
 const ruleFormRef = ref<FormInstance>()
 const form: Ref<Iform> = ref({
   number: '', // 编号
@@ -19,55 +17,9 @@
   business: '', // 关联业务
   formID: '', // formID
   desc: '', // 流程描述
-  selectDecision: '', // 选择的决策
-  rejectTo: '', // 可驳回至
-  changeData: '', // 驳回修改数据
-  isMessage: '', // 审批结果通知发起人
 })
-// 可选决策项
-const decision = [
-  {
-    id: 'reject-refuse',
-    title: '同意 驳回 拒绝',
-  },
-  {
-    id: 'reject',
-    title: '同意 驳回',
-  },
-  {
-    id: 'refuse',
-    title: '同意 拒绝',
-  },
-]
-// 可驳回至
-const reject = [
-  {
-    id: 'change',
-    title: '单据修改',
-  },
-]
-// 驳回修改数据
-const rejectChangeData = [
-  {
-    id: 'all',
-    title: '重新按流程走',
-  },
-  {
-    id: 'part',
-    title: '送至驳回节点',
-  },
-]
-// 审批结果通知发起人
-const messageData = [
-  {
-    id: 'yes',
-    title: '是',
-  },
-  {
-    id: 'no',
-    title: '否',
-  },
-]
+
+// 表单校验
 const rules = reactive<FormRules>({
   name: [
     {
@@ -104,6 +56,7 @@
 const close = () => {
   $router.back()
 }
+
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -115,20 +68,7 @@
   })
 }
 
-// 选择决策项
-const changeDecision = (value: string) => {
-  form.value.selectDecision = value
-}
-const changeRejectTo = (value: string) => {
-  form.value.rejectTo = value
-}
-const changeData = (value: string) => {
-  form.value.changeData = value
-}
-const changeMessage = (value: string) => {
-  form.value.isMessage = value
-}
-
+// 监听流程组件--新建流程成功
 const createProcessSuccess = () => {
   close()
 }
@@ -152,42 +92,11 @@
               <el-form-item label="流程编号:">
                 <el-input v-model="form.number" disabled placeholder="系统自动生成" />
               </el-form-item>
-              <!-- <el-form-item label="可选决策项" prop="selectDecision">
-                <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
-                  <el-option
-                    v-for="item in decision"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="流程名称:" prop="name">
                 <el-input v-model="form.name" placeholder="请输入流程名称" />
               </el-form-item>
-
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
-                <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
-                  <el-option
-                    v-for="item in reject"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
-              <!-- <el-form-item label="审批结果通知发起人" prop="isMessage">
-                <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
-                  <el-option
-                    v-for="item in messageData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="formID:" prop="formID">
@@ -198,16 +107,6 @@
               <el-form-item label="关联业务:" prop="business">
                 <el-input v-model="form.business" placeholder="请输入关联业务" />
               </el-form-item>
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
-                <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
-                  <el-option
-                    v-for="item in rejectChangeData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="16">
               <el-form-item label="流程描述" prop="desc">
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 26374ea..584d31e 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -17,55 +17,7 @@
   name: '', // 名称
   business: '', // 关联业务
   desc: '', // 流程描述
-  selectDecision: '同意 驳回 拒绝', // 选择的决策
-  rejectTo: '2', // 可驳回至
-  changeData: '2', // 驳回修改数据
-  isMessage: 'shi', // 审批结果通知发起人
 })
-// 可选决策项
-const decision = [
-  {
-    id: 'reject-refuse',
-    title: '同意 驳回 拒绝',
-  },
-  {
-    id: 'reject',
-    title: '同意 驳回',
-  },
-  {
-    id: 'refuse',
-    title: '同意 拒绝',
-  },
-]
-// 可驳回至
-const reject = [
-  {
-    id: 'change',
-    title: '单据修改',
-  },
-]
-// 驳回修改数据
-const rejectChangeData = [
-  {
-    id: 'all',
-    title: '重新按流程走',
-  },
-  {
-    id: 'part',
-    title: '送至驳回节点',
-  },
-]
-// 审批结果通知发起人
-const messageData = [
-  {
-    id: 'yes',
-    title: '是',
-  },
-  {
-    id: 'no',
-    title: '否',
-  },
-]
 const $router = useRouter()
 // 关闭
 const close = () => {
@@ -96,18 +48,7 @@
           <el-col :span="8">
             <el-form-item label="流程编号">
               <el-input v-model="form.number" disabled type="textarea" autosize />
-              <!-- {{ form.number }} -->
             </el-form-item>
-            <!-- <el-form-item label="可选决策项">
-              <el-select v-model="form.selectDecision" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in decision"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
             <el-form-item label="流程描述">
               <el-input v-model="form.desc" disabled type="textarea" autosize />
             </el-form-item>
@@ -115,47 +56,12 @@
           <el-col :span="8">
             <el-form-item label="流程名称">
               <el-input v-model="form.name" disabled />
-
-              <!-- {{ form.name }} -->
             </el-form-item>
-
-            <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至">
-              <el-select v-model="form.rejectTo" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in reject"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
-            <!-- <el-form-item label="审批结果通知发起人">
-              <el-select v-model="form.isMessage" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in messageData"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
           </el-col>
           <el-col :span="8">
             <el-form-item label="关联业务">
               <el-input v-model="form.business" disabled />
-
-              <!-- {{ form.business }} -->
             </el-form-item>
-            <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据">
-              <el-select v-model="form.changeData" disabled placeholder="请选择">
-                <el-option
-                  v-for="item in rejectChangeData"
-                  :key="item.id"
-                  :label="item.title"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item> -->
           </el-col>
         </el-row>
       </el-form>
diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue
index f1cdf25..5f10748 100644
--- a/src/views/system/process/editProcess.vue
+++ b/src/views/system/process/editProcess.vue
@@ -18,55 +18,7 @@
   name: '', // 名称
   business: '', // 关联业务
   desc: '', // 流程描述
-  selectDecision: '', // 选择的决策
-  rejectTo: '', // 可驳回至
-  changeData: '', // 驳回修改数据
-  isMessage: '', // 审批结果通知发起人
 })
-// 可选决策项
-const decision = [
-  {
-    id: 'reject-refuse',
-    title: '同意 驳回 拒绝',
-  },
-  {
-    id: 'reject',
-    title: '同意 驳回',
-  },
-  {
-    id: 'refuse',
-    title: '同意 拒绝',
-  },
-]
-// 可驳回至
-const reject = [
-  {
-    id: 'change',
-    title: '单据修改',
-  },
-]
-// 驳回修改数据
-const rejectChangeData = [
-  {
-    id: 'all',
-    title: '重新按流程走',
-  },
-  {
-    id: 'part',
-    title: '送至驳回节点',
-  },
-]
-// 审批结果通知发起人
-const messageData = [
-  {
-    id: 'yes',
-    title: '是',
-  },
-  {
-    id: 'no',
-    title: '否',
-  },
-]
 const rules = reactive<FormRules>({
   selectDecision: [
     {
@@ -101,8 +53,9 @@
 const $router = useRouter()
 // 关闭
 const close = () => {
-  $router.push('/process/list')
+  $router.back()
 }
+
 // 保存
 const save = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
@@ -117,20 +70,6 @@
   })
 }
 
-// 选择决策项
-const changeDecision = (value: string) => {
-  form.value.selectDecision = value
-}
-const changeRejectTo = (value: string) => {
-  form.value.rejectTo = value
-}
-const changeData = (value: string) => {
-  form.value.changeData = value
-}
-const changeMessage = (value: string) => {
-  form.value.isMessage = value
-}
-
 onMounted(() => {
   const rowData: any = $route.query.rowData
   getRowData.value = JSON.parse(rowData)
@@ -158,19 +97,8 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="流程编号:">
-                <!-- {{ form.number }} -->
                 <el-input v-model="form.number" disabled type="textarea" autosize />
               </el-form-item>
-              <!-- <el-form-item label="可选决策项" prop="selectDecision">
-                <el-select v-model="form.selectDecision" placeholder="请选择" @change="changeDecision">
-                  <el-option
-                    v-for="item in decision"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
               <el-form-item label="流程描述">
                 <!-- <el-input v-model="form.desc" type="textarea" /> -->
                 <el-input v-model="form.desc" disabled type="textarea" autosize />
@@ -180,43 +108,11 @@
               <el-form-item label="流程名称:">
                 <el-input v-model="form.name" disabled />
               </el-form-item>
-
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="可驳回至" prop="rejectTo">
-                <el-select v-model="form.rejectTo" placeholder="请选择" @change="changeRejectTo">
-                  <el-option
-                    v-for="item in reject"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
-              <!-- <el-form-item label="审批结果通知发起人" prop="isMessage">
-                <el-select v-model="form.isMessage" placeholder="请选择" @change="changeMessage">
-                  <el-option
-                    v-for="item in messageData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
             <el-col :span="8">
               <el-form-item label="关联业务:">
-                <!-- {{ form.business }} -->
                 <el-input v-model="form.business" disabled />
               </el-form-item>
-              <!-- <el-form-item v-if="form.selectDecision !== 'refuse'" label="驳回修改数据" prop="changeData">
-                <el-select v-model="form.changeData" placeholder="请选择" @change="changeData">
-                  <el-option
-                    v-for="item in rejectChangeData"
-                    :key="item.id"
-                    :label="item.title"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item> -->
             </el-col>
           </el-row>
         </el-form>
diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts
index d6a9b21..6ab1ed5 100644
--- a/src/views/system/process/process.ts
+++ b/src/views/system/process/process.ts
@@ -19,10 +19,6 @@
   business: string // 关联业务
   desc?: string // 流程描述
   formID?: string
-  selectDecision: string // 选择的决策
-  rejectTo?: string // 可驳回至
-  changeData?: string // 驳回修改数据
-  isMessage: string // 审批结果通知发起人
 }
 
 // 关联业务列表
@@ -35,4 +31,10 @@
   type: string
   name?: string
 }
+// 流程基本信息
+export interface IworkFlowDef {
+  name: string // 名称
+  decisionItem?: number | string // 可选决策项
+  noticeStarter?: number | string // 审批结果是否通知发起人
+}
 
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index a89aeb4..2edd4c1 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -1,19 +1,14 @@
+<!-- 流程列表 -->
 <script lang="ts" setup name="Process">
 import { onMounted, reactive, ref } from 'vue'
-import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { Delete } from '@element-plus/icons-vue'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { IBusinessList, IlistQuery } from './process'
-import EditProcess from './editProcess.vue'
-import DetailProcess from './detailProcess.vue'
 import { delProcessList, exportProcessList, getBusinessList, getProcessList, updateState } from '@/api/system/process'
-import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
 
 const { proxy } = getCurrentInstance() as any
-const active = ref('main')
 const businessList = ref<IBusinessList[]>([]) // 关联业务列表
 const listQuery = reactive({
   deploymentId: '', // 流程部署id
@@ -28,6 +23,8 @@
   offset: 1,
   limit: 20,
 })
+
+// 流程状态筛选参数
 const searchStatus = [
   {
     value: 1,
@@ -38,6 +35,7 @@
     label: '废止',
   },
 ]
+// 表头
 const columns = ref([
   { text: '流程编号', value: 'number' },
   { text: '流程名称', value: 'name' },
@@ -49,11 +47,9 @@
 ])
 const list = ref([])
 const total = ref(20)
-// const logTypeList = ref(null)
 const listLoading = ref(false)
-// const dialogFormVisible = ref(false)
-// const dialogStatus = ref('')
 const checkoutList = ref<string[]>([]) // 多选选中结果
+
 // 获取流程列表
 const fetchData = async (isNowPage: boolean) => {
   listLoading.value = true
@@ -122,14 +118,17 @@
   listQuery.suspensionState = ''
   fetchData(true)
 }
+
 const $router = useRouter()
 // 点击编辑/详情
 const handleEdit = (row: IlistQuery, pageType: 'edit' | 'detail') => {
   $router.push({ path: `/process/${pageType}`, query: { rowData: JSON.stringify(row) } })
 }
+// 点击新建
 const add = () => {
   $router.push({ path: '/process/add' })
 }
+
 // 废止
 const abolish = (row: IlistQuery) => {
   const state = row.status === '激活' ? 2 : 1
@@ -140,6 +139,7 @@
     }
   })
 }
+
 // 删除
 const del = (row: IlistQuery) => {
   ElMessageBox.confirm(
@@ -160,10 +160,6 @@
       })
     })
 }
-// 编辑页面点击关闭
-const close = () => {
-  active.value = 'main'
-}
 
 // 导出
 const exportAll = () => {
@@ -237,124 +233,121 @@
 <template>
   <div class="process">
     <app-container>
-      <!-- 主页面 -->
-      <div v-if="active === 'main'">
-        <!-- 筛选条件 -->
-        <search-area :need-clear="true" @search="search" @clear="reset">
-          <search-item>
-            <el-input
-              v-model.trim="listQuery.number"
-              placeholder="流程编号"
-              clearable
+      <!-- 筛选条件 -->
+      <search-area :need-clear="true" @search="search" @clear="reset">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.number"
+            placeholder="流程编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.name"
+            placeholder="流程名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select v-model="listQuery.business" placeholder="请选择关联业务" clearable>
+            <el-option
+              v-for="item in businessList"
+              :key="item.formId"
+              :label="item.formName"
+              :value="item.formId"
             />
-          </search-item>
-          <search-item>
-            <el-input
-              v-model.trim="listQuery.name"
-              placeholder="流程名称"
-              clearable
-            />
-          </search-item>
-          <search-item>
-            <el-select v-model="listQuery.business" placeholder="请选择关联业务" clearable>
-              <el-option
-                v-for="item in businessList"
-                :key="item.formId"
-                :label="item.formName"
-                :value="item.formId"
-              />
-            </el-select>
-          </search-item>
+          </el-select>
+        </search-item>
 
-          <search-item>
-            <el-select v-model="listQuery.suspensionState" placeholder="当前流程状态" clearable>
-              <el-option
-                v-for="item in searchStatus"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </search-item>
-          <search-item>
-            <el-input
-              v-model.trim="listQuery.person"
-              placeholder="流程负责人"
-              clearable
+        <search-item>
+          <el-select v-model="listQuery.suspensionState" placeholder="当前流程状态" clearable>
+            <el-option
+              v-for="item in searchStatus"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
             />
-          </search-item>
-          <search-item>
-            <el-date-picker
-              v-model="listQuery.beginTime"
-              type="datetime"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择开始时间"
-            />
-          </search-item>
-          <search-item>
-            <el-date-picker
-              v-model="listQuery.endTime"
-              type="datetime"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="选择结束时间"
-            />
-          </search-item>
-        </search-area>
-        <!-- 查询结果Table显示 -->
-        <table-container>
-          <template #btns-right>
-            <icon-button v-if="proxy.hasPerm('/sys/process/add')" icon="icon-add" title="新建" type="primary" @click="add" />
-            <icon-button v-if="proxy.hasPerm('/sys/process/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
-            <icon-button v-if="proxy.hasPerm('/sys/process/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
-          </template>
+          </el-select>
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.person"
+            placeholder="流程负责人"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.beginTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="选择开始时间"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.endTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="选择结束时间"
+          />
+        </search-item>
+      </search-area>
+      <!-- 查询结果Table显示 -->
+      <table-container>
+        <template #btns-right>
+          <icon-button v-if="proxy.hasPerm('/sys/process/add')" icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button v-if="proxy.hasPerm('/sys/process/export')" icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-if="proxy.hasPerm('/sys/process/print')" icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
 
-          <div class="table-area">
-            <normal-table
-              :data="list"
-              :total="total"
-              :columns="columns"
-              :query="listQuery"
-              is-showmulti-select
-              :list-loading="listLoading"
-              @change="changePage"
-              @multiSelect="selectionChange"
-            >
-              <template #preColumns>
-                <el-table-column label="序号" width="55" align="center">
-                  <template #default="scope">
-                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
-                  </template>
-                </el-table-column>
-              </template>
-              <template #columns>
-                <el-table-column label="操作" width="160" align="center" fixed="right">
-                  <template #default="scope">
-                    <el-button
-                      v-if="proxy.hasPerm('/sys/process/edit')"
-                      type="primary"
-                      link
-                      size="small"
-                      class="table-text-button"
-                      @click="handleEdit(scope.row, 'edit')"
-                    >
-                      编辑
-                    </el-button>
-                    <el-button type="primary" link size="small" class="table-text-button" @click="handleEdit(scope.row, 'detail')">
-                      详情
-                    </el-button>
-                    <el-button type="primary" link size="small" class="table-text-button" @click="abolish(scope.row)">
-                      {{ scope.row.suspensionState === 1 ? '废止' : '激活' }}
-                    </el-button>
-                    <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
-                      删除
-                    </el-button>
-                  </template>
-                </el-table-column>
-              </template>
-            </normal-table>
-          </div>
-        </table-container>
-      </div>
+        <div class="table-area">
+          <normal-table
+            :data="list"
+            :total="total"
+            :columns="columns"
+            :query="listQuery"
+            is-showmulti-select
+            :list-loading="listLoading"
+            @change="changePage"
+            @multiSelect="selectionChange"
+          >
+            <template #preColumns>
+              <el-table-column label="序号" width="55" align="center">
+                <template #default="scope">
+                  {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                </template>
+              </el-table-column>
+            </template>
+            <template #columns>
+              <el-table-column label="操作" width="160" align="center" fixed="right">
+                <template #default="scope">
+                  <el-button
+                    v-if="proxy.hasPerm('/sys/process/edit')"
+                    type="primary"
+                    link
+                    size="small"
+                    class="table-text-button"
+                    @click="handleEdit(scope.row, 'edit')"
+                  >
+                    编辑
+                  </el-button>
+                  <el-button type="primary" link size="small" class="table-text-button" @click="handleEdit(scope.row, 'detail')">
+                    详情
+                  </el-button>
+                  <el-button type="primary" link size="small" class="table-text-button" @click="abolish(scope.row)">
+                    {{ scope.row.suspensionState === 1 ? '废止' : '激活' }}
+                  </el-button>
+                  <el-button type="danger" link size="small" class="table-text-button" @click="del(scope.row)">
+                    删除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </template>
+          </normal-table>
+        </div>
+      </table-container>
     </app-container>
   </div>
 </template>