diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/measure/source/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/measure/source/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/measure/source/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
new file mode 100644
index 0000000..3880028
--- /dev/null
+++ b/src/views/measure/source/components/listApproval.vue
@@ -0,0 +1,332 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '业务范围', value: 'businessScope', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '联系方式', value: 'phone', align: 'center' },
+  { text: '地址', value: 'address', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/source/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="溯源供方编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="溯源供方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/measure/source/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
new file mode 100644
index 0000000..3880028
--- /dev/null
+++ b/src/views/measure/source/components/listApproval.vue
@@ -0,0 +1,332 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '业务范围', value: 'businessScope', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '联系方式', value: 'phone', align: 'center' },
+  { text: '地址', value: 'address', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/source/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="溯源供方编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="溯源供方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
deleted file mode 100644
index 31fb09f..0000000
--- a/src/views/measure/source/components/listPage.vue
+++ /dev/null
@@ -1,372 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType, IlistTypes } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: '0',
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([])
-// 总数
-const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 表头
-const columns = ref([
-  {
-    text: '溯源供方编号',
-    value: 'supplierNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '溯源供方名称',
-    value: 'supplierName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '业务内容',
-    value: 'businessContent',
-    align: 'center',
-  },
-  {
-    text: '业务范围',
-    value: 'businessScope',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '联系方式',
-    value: 'phone',
-    align: 'center',
-  },
-  {
-    text: '地址',
-    value: 'address',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 初始化路由
-const $router = useRouter()
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const pageTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (pageType === '删除') {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-      else {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '取消成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-    })
-}
-
-const approvalDialog = ref()
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    // applyShow.value = true
-    approvalDialog.value.initDialog('agree', '1')
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 点击搜索
-const searchList = () => {
-  fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    approvalStatus: '',
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    formId: '1',
-    supplierName: '',
-    supplierNo: '',
-    offset: 1,
-    limit: 20,
-  }
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  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 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 upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-
-const add = () => {
-  $router.push('/source/approve/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="溯源供方编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="溯源供方名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="业务内容"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="地址"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </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" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-</template>
-

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/measure/source/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
new file mode 100644
index 0000000..3880028
--- /dev/null
+++ b/src/views/measure/source/components/listApproval.vue
@@ -0,0 +1,332 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '业务范围', value: 'businessScope', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '联系方式', value: 'phone', align: 'center' },
+  { text: '地址', value: 'address', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/source/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="溯源供方编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="溯源供方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
deleted file mode 100644
index 31fb09f..0000000
--- a/src/views/measure/source/components/listPage.vue
+++ /dev/null
@@ -1,372 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType, IlistTypes } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: '0',
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([])
-// 总数
-const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 表头
-const columns = ref([
-  {
-    text: '溯源供方编号',
-    value: 'supplierNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '溯源供方名称',
-    value: 'supplierName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '业务内容',
-    value: 'businessContent',
-    align: 'center',
-  },
-  {
-    text: '业务范围',
-    value: 'businessScope',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '联系方式',
-    value: 'phone',
-    align: 'center',
-  },
-  {
-    text: '地址',
-    value: 'address',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 初始化路由
-const $router = useRouter()
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const pageTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (pageType === '删除') {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-      else {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '取消成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-    })
-}
-
-const approvalDialog = ref()
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    // applyShow.value = true
-    approvalDialog.value.initDialog('agree', '1')
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 点击搜索
-const searchList = () => {
-  fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    approvalStatus: '',
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    formId: '1',
-    supplierName: '',
-    supplierNo: '',
-    offset: 1,
-    limit: 20,
-  }
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  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 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 upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-
-const add = () => {
-  $router.push('/source/approve/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="溯源供方编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="溯源供方名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="业务内容"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="地址"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </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" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-</template>
-
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
deleted file mode 100644
index 289b3e4..0000000
--- a/src/views/measure/source/components/listPageAdd.vue
+++ /dev/null
@@ -1,729 +0,0 @@
-<script lang="ts" setup name="ListpageSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline, traceSupplierPerson } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { UploadFile } from '@/api/measure/file'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
-  traceSupplierPersonList: [],
-})
-const ruleFormRef = ref<FormInstance>()
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
-const columns = [
-  { text: '人员编号', value: 'personNo' },
-  { text: '姓名', value: 'name' },
-  { text: '工作部门', value: 'department' },
-  { text: '职务', value: 'job' },
-  { text: '联系方式', value: 'phone' },
-]
-// 控制审批弹窗开关
-const applyShow = ref(false)
-const rules = ref({
-  supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const provinceList = ref([])
-const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const getInfo = () => {
-  getSoucreListDetail({ id: infoId.value }).then((res) => {
-    // formInline.value = res.data
-  })
-}
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 获取公司地址省级
-const getCompanyAddress = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    provinceList.value = res.data
-  })
-}
-// 公司地址省级的值发生改变
-const changeProvince = (e: any) => {
-  cityList.value = []
-  areaList.value = []
-  formInline.value.companyCity = ''
-  formInline.value.companyArea = ''
-
-  getSoucreListlevelType(e).then((res) => {
-    cityList.value = res.data
-  })
-}
-// 公司地址市级发生改变
-const cityChange = (e: any) => {
-  areaList.value = []
-  formInline.value.companyArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaList.value = res.data
-  })
-}
-// 获取到开票地址省级
-const getinvoiceProvinceList = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    invoiceProvince.value = res.data
-  })
-}
-// 开票地址省级发生改变
-const changeInvoice = (e: any) => {
-  formInline.value.invoiceCity = ''
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    invoiceCityList.value = res.data
-  })
-}
-// 开票地址市级发生改变
-const invoiceCityChange = (e: string) => {
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaInvoiceList.value = res.data
-  })
-}
-// 点击增加行
-const addRow = () => {
-  // 检查上一行必填项
-  if (checkPersonList()) {
-    setAllRowReadable()
-    traceSupplierPersonList.value.push({ ...addPersonObj })
-  }
-}
-// 检查人员列表
-function checkPersonList() {
-  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
-    const item = traceSupplierPersonList.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
-    return !SelectionList.value.includes(item)
-  })
-}
-// 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log('6666')
-  if (type === '提交' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getSoucreListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (type === '提交' && pageType.value !== 'edit') {
-    formInline.value.id = infoId.value
-    getSoucreLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-// 双击行显示输入框
-const dblclickRow = (row: traceSupplierPerson) => {
-  setAllRowReadable()
-  row.editable = true
-}
-// 将所有人员信息列表置为不可编辑状态
-function setAllRowReadable() {
-  for (const item of traceSupplierPersonList.value) {
-    item.editable = false
-  }
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        label-width="auto"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="溯源供方编号:" prop="supplierNo">
-              <el-input
-                v-model="formInline.supplierNo"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税号:" prop="taxNumber">
-              <el-input
-                v-model="formInline.taxNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮编:">
-              <el-input
-                v-model="formInline.postalCode"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="手机:">
-              <el-input
-                v-model="formInline.mobile"
-                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司名称:" prop="supplierName">
-              <el-input
-                v-model="formInline.supplierName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账户名:">
-              <el-input
-                v-model="formInline.bankAccount"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="负责人:">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮箱:">
-              <el-input
-                v-model="formInline.mailbox"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司简称:">
-              <el-input
-                v-model="formInline.briefName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行名称:">
-              <el-input
-                v-model="formInline.bankName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="电话:">
-              <el-input
-                v-model="formInline.phone"
-                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="网址:">
-              <el-input
-                v-model="formInline.website"
-                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="业务内容:" prop="businessContent">
-              <el-input
-                v-model="formInline.businessContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账号:">
-              <el-input
-                v-model="formInline.bankAccountNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真:">
-              <el-input
-                v-model="formInline.fax"
-                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="公司地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getCompanyAddress('0')"
-                @change="changeProvince"
-              >
-                <el-option
-                  v-for="province in provinceList"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="cityChange"
-              >
-                <el-option
-                  v-for="city in cityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.companyAddress"
-                placeholder="公司详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="开票地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getinvoiceProvinceList('0')"
-                @change="changeInvoice"
-              >
-                <el-option
-                  v-for="province in invoiceProvince"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="invoiceCityChange"
-              >
-                <el-option
-                  v-for="city in invoiceCityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaInvoiceList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.invoiceAddress"
-                placeholder="开票详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="公司业务范围:">
-              <el-input
-                v-model="formInline.businessScope"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入公司业务范围'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="traceSupplierPersonList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .content-top {
-    display: flex;
-    justify-content: space-around;
-  }
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.el-select {
-  width: 9vw;
-  margin-right: 15px;
-}
-
-.info-dizhi .el-input {
-  width: 20vw;
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.info-appendix span {
-  margin-right: 25px;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/measure/source/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
new file mode 100644
index 0000000..3880028
--- /dev/null
+++ b/src/views/measure/source/components/listApproval.vue
@@ -0,0 +1,332 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '业务范围', value: 'businessScope', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '联系方式', value: 'phone', align: 'center' },
+  { text: '地址', value: 'address', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/source/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="溯源供方编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="溯源供方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
deleted file mode 100644
index 31fb09f..0000000
--- a/src/views/measure/source/components/listPage.vue
+++ /dev/null
@@ -1,372 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType, IlistTypes } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: '0',
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([])
-// 总数
-const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 表头
-const columns = ref([
-  {
-    text: '溯源供方编号',
-    value: 'supplierNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '溯源供方名称',
-    value: 'supplierName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '业务内容',
-    value: 'businessContent',
-    align: 'center',
-  },
-  {
-    text: '业务范围',
-    value: 'businessScope',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '联系方式',
-    value: 'phone',
-    align: 'center',
-  },
-  {
-    text: '地址',
-    value: 'address',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 初始化路由
-const $router = useRouter()
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const pageTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (pageType === '删除') {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-      else {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '取消成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-    })
-}
-
-const approvalDialog = ref()
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    // applyShow.value = true
-    approvalDialog.value.initDialog('agree', '1')
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 点击搜索
-const searchList = () => {
-  fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    approvalStatus: '',
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    formId: '1',
-    supplierName: '',
-    supplierNo: '',
-    offset: 1,
-    limit: 20,
-  }
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  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 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 upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-
-const add = () => {
-  $router.push('/source/approve/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="溯源供方编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="溯源供方名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="业务内容"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="地址"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </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" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-</template>
-
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
deleted file mode 100644
index 289b3e4..0000000
--- a/src/views/measure/source/components/listPageAdd.vue
+++ /dev/null
@@ -1,729 +0,0 @@
-<script lang="ts" setup name="ListpageSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline, traceSupplierPerson } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { UploadFile } from '@/api/measure/file'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
-  traceSupplierPersonList: [],
-})
-const ruleFormRef = ref<FormInstance>()
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
-const columns = [
-  { text: '人员编号', value: 'personNo' },
-  { text: '姓名', value: 'name' },
-  { text: '工作部门', value: 'department' },
-  { text: '职务', value: 'job' },
-  { text: '联系方式', value: 'phone' },
-]
-// 控制审批弹窗开关
-const applyShow = ref(false)
-const rules = ref({
-  supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const provinceList = ref([])
-const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const getInfo = () => {
-  getSoucreListDetail({ id: infoId.value }).then((res) => {
-    // formInline.value = res.data
-  })
-}
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 获取公司地址省级
-const getCompanyAddress = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    provinceList.value = res.data
-  })
-}
-// 公司地址省级的值发生改变
-const changeProvince = (e: any) => {
-  cityList.value = []
-  areaList.value = []
-  formInline.value.companyCity = ''
-  formInline.value.companyArea = ''
-
-  getSoucreListlevelType(e).then((res) => {
-    cityList.value = res.data
-  })
-}
-// 公司地址市级发生改变
-const cityChange = (e: any) => {
-  areaList.value = []
-  formInline.value.companyArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaList.value = res.data
-  })
-}
-// 获取到开票地址省级
-const getinvoiceProvinceList = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    invoiceProvince.value = res.data
-  })
-}
-// 开票地址省级发生改变
-const changeInvoice = (e: any) => {
-  formInline.value.invoiceCity = ''
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    invoiceCityList.value = res.data
-  })
-}
-// 开票地址市级发生改变
-const invoiceCityChange = (e: string) => {
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaInvoiceList.value = res.data
-  })
-}
-// 点击增加行
-const addRow = () => {
-  // 检查上一行必填项
-  if (checkPersonList()) {
-    setAllRowReadable()
-    traceSupplierPersonList.value.push({ ...addPersonObj })
-  }
-}
-// 检查人员列表
-function checkPersonList() {
-  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
-    const item = traceSupplierPersonList.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
-    return !SelectionList.value.includes(item)
-  })
-}
-// 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log('6666')
-  if (type === '提交' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getSoucreListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (type === '提交' && pageType.value !== 'edit') {
-    formInline.value.id = infoId.value
-    getSoucreLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-// 双击行显示输入框
-const dblclickRow = (row: traceSupplierPerson) => {
-  setAllRowReadable()
-  row.editable = true
-}
-// 将所有人员信息列表置为不可编辑状态
-function setAllRowReadable() {
-  for (const item of traceSupplierPersonList.value) {
-    item.editable = false
-  }
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        label-width="auto"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="溯源供方编号:" prop="supplierNo">
-              <el-input
-                v-model="formInline.supplierNo"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税号:" prop="taxNumber">
-              <el-input
-                v-model="formInline.taxNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮编:">
-              <el-input
-                v-model="formInline.postalCode"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="手机:">
-              <el-input
-                v-model="formInline.mobile"
-                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司名称:" prop="supplierName">
-              <el-input
-                v-model="formInline.supplierName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账户名:">
-              <el-input
-                v-model="formInline.bankAccount"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="负责人:">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮箱:">
-              <el-input
-                v-model="formInline.mailbox"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司简称:">
-              <el-input
-                v-model="formInline.briefName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行名称:">
-              <el-input
-                v-model="formInline.bankName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="电话:">
-              <el-input
-                v-model="formInline.phone"
-                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="网址:">
-              <el-input
-                v-model="formInline.website"
-                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="业务内容:" prop="businessContent">
-              <el-input
-                v-model="formInline.businessContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账号:">
-              <el-input
-                v-model="formInline.bankAccountNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真:">
-              <el-input
-                v-model="formInline.fax"
-                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="公司地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getCompanyAddress('0')"
-                @change="changeProvince"
-              >
-                <el-option
-                  v-for="province in provinceList"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="cityChange"
-              >
-                <el-option
-                  v-for="city in cityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.companyAddress"
-                placeholder="公司详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="开票地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getinvoiceProvinceList('0')"
-                @change="changeInvoice"
-              >
-                <el-option
-                  v-for="province in invoiceProvince"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="invoiceCityChange"
-              >
-                <el-option
-                  v-for="city in invoiceCityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaInvoiceList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.invoiceAddress"
-                placeholder="开票详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="公司业务范围:">
-              <el-input
-                v-model="formInline.businessScope"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入公司业务范围'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="traceSupplierPersonList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .content-top {
-    display: flex;
-    justify-content: space-around;
-  }
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.el-select {
-  width: 9vw;
-  margin-right: 15px;
-}
-
-.info-dizhi .el-input {
-  width: 20vw;
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.info-appendix span {
-  margin-right: 25px;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/source/components/manageBox.vue b/src/views/measure/source/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/source/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/measure/source/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
new file mode 100644
index 0000000..3880028
--- /dev/null
+++ b/src/views/measure/source/components/listApproval.vue
@@ -0,0 +1,332 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '业务范围', value: 'businessScope', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '联系方式', value: 'phone', align: 'center' },
+  { text: '地址', value: 'address', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/source/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="溯源供方编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="溯源供方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
deleted file mode 100644
index 31fb09f..0000000
--- a/src/views/measure/source/components/listPage.vue
+++ /dev/null
@@ -1,372 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType, IlistTypes } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: '0',
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([])
-// 总数
-const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 表头
-const columns = ref([
-  {
-    text: '溯源供方编号',
-    value: 'supplierNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '溯源供方名称',
-    value: 'supplierName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '业务内容',
-    value: 'businessContent',
-    align: 'center',
-  },
-  {
-    text: '业务范围',
-    value: 'businessScope',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '联系方式',
-    value: 'phone',
-    align: 'center',
-  },
-  {
-    text: '地址',
-    value: 'address',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 初始化路由
-const $router = useRouter()
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const pageTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (pageType === '删除') {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-      else {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '取消成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-    })
-}
-
-const approvalDialog = ref()
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    // applyShow.value = true
-    approvalDialog.value.initDialog('agree', '1')
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 点击搜索
-const searchList = () => {
-  fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    approvalStatus: '',
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    formId: '1',
-    supplierName: '',
-    supplierNo: '',
-    offset: 1,
-    limit: 20,
-  }
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  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 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 upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-
-const add = () => {
-  $router.push('/source/approve/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="溯源供方编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="溯源供方名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="业务内容"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="地址"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </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" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-</template>
-
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
deleted file mode 100644
index 289b3e4..0000000
--- a/src/views/measure/source/components/listPageAdd.vue
+++ /dev/null
@@ -1,729 +0,0 @@
-<script lang="ts" setup name="ListpageSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline, traceSupplierPerson } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { UploadFile } from '@/api/measure/file'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
-  traceSupplierPersonList: [],
-})
-const ruleFormRef = ref<FormInstance>()
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
-const columns = [
-  { text: '人员编号', value: 'personNo' },
-  { text: '姓名', value: 'name' },
-  { text: '工作部门', value: 'department' },
-  { text: '职务', value: 'job' },
-  { text: '联系方式', value: 'phone' },
-]
-// 控制审批弹窗开关
-const applyShow = ref(false)
-const rules = ref({
-  supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const provinceList = ref([])
-const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const getInfo = () => {
-  getSoucreListDetail({ id: infoId.value }).then((res) => {
-    // formInline.value = res.data
-  })
-}
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 获取公司地址省级
-const getCompanyAddress = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    provinceList.value = res.data
-  })
-}
-// 公司地址省级的值发生改变
-const changeProvince = (e: any) => {
-  cityList.value = []
-  areaList.value = []
-  formInline.value.companyCity = ''
-  formInline.value.companyArea = ''
-
-  getSoucreListlevelType(e).then((res) => {
-    cityList.value = res.data
-  })
-}
-// 公司地址市级发生改变
-const cityChange = (e: any) => {
-  areaList.value = []
-  formInline.value.companyArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaList.value = res.data
-  })
-}
-// 获取到开票地址省级
-const getinvoiceProvinceList = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    invoiceProvince.value = res.data
-  })
-}
-// 开票地址省级发生改变
-const changeInvoice = (e: any) => {
-  formInline.value.invoiceCity = ''
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    invoiceCityList.value = res.data
-  })
-}
-// 开票地址市级发生改变
-const invoiceCityChange = (e: string) => {
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaInvoiceList.value = res.data
-  })
-}
-// 点击增加行
-const addRow = () => {
-  // 检查上一行必填项
-  if (checkPersonList()) {
-    setAllRowReadable()
-    traceSupplierPersonList.value.push({ ...addPersonObj })
-  }
-}
-// 检查人员列表
-function checkPersonList() {
-  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
-    const item = traceSupplierPersonList.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
-    return !SelectionList.value.includes(item)
-  })
-}
-// 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log('6666')
-  if (type === '提交' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getSoucreListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (type === '提交' && pageType.value !== 'edit') {
-    formInline.value.id = infoId.value
-    getSoucreLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-// 双击行显示输入框
-const dblclickRow = (row: traceSupplierPerson) => {
-  setAllRowReadable()
-  row.editable = true
-}
-// 将所有人员信息列表置为不可编辑状态
-function setAllRowReadable() {
-  for (const item of traceSupplierPersonList.value) {
-    item.editable = false
-  }
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        label-width="auto"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="溯源供方编号:" prop="supplierNo">
-              <el-input
-                v-model="formInline.supplierNo"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税号:" prop="taxNumber">
-              <el-input
-                v-model="formInline.taxNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮编:">
-              <el-input
-                v-model="formInline.postalCode"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="手机:">
-              <el-input
-                v-model="formInline.mobile"
-                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司名称:" prop="supplierName">
-              <el-input
-                v-model="formInline.supplierName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账户名:">
-              <el-input
-                v-model="formInline.bankAccount"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="负责人:">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮箱:">
-              <el-input
-                v-model="formInline.mailbox"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司简称:">
-              <el-input
-                v-model="formInline.briefName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行名称:">
-              <el-input
-                v-model="formInline.bankName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="电话:">
-              <el-input
-                v-model="formInline.phone"
-                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="网址:">
-              <el-input
-                v-model="formInline.website"
-                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="业务内容:" prop="businessContent">
-              <el-input
-                v-model="formInline.businessContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账号:">
-              <el-input
-                v-model="formInline.bankAccountNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真:">
-              <el-input
-                v-model="formInline.fax"
-                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="公司地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getCompanyAddress('0')"
-                @change="changeProvince"
-              >
-                <el-option
-                  v-for="province in provinceList"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="cityChange"
-              >
-                <el-option
-                  v-for="city in cityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.companyAddress"
-                placeholder="公司详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="开票地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getinvoiceProvinceList('0')"
-                @change="changeInvoice"
-              >
-                <el-option
-                  v-for="province in invoiceProvince"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="invoiceCityChange"
-              >
-                <el-option
-                  v-for="city in invoiceCityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaInvoiceList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.invoiceAddress"
-                placeholder="开票详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="公司业务范围:">
-              <el-input
-                v-model="formInline.businessScope"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入公司业务范围'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="traceSupplierPersonList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .content-top {
-    display: flex;
-    justify-content: space-around;
-  }
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.el-select {
-  width: 9vw;
-  margin-right: 15px;
-}
-
-.info-dizhi .el-input {
-  width: 20vw;
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.info-appendix span {
-  margin-right: 25px;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/source/components/manageBox.vue b/src/views/measure/source/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/source/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/measure/source/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/measure/source/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
new file mode 100644
index 0000000..3880028
--- /dev/null
+++ b/src/views/measure/source/components/listApproval.vue
@@ -0,0 +1,332 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '业务范围', value: 'businessScope', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '联系方式', value: 'phone', align: 'center' },
+  { text: '地址', value: 'address', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/source/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="溯源供方编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="溯源供方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
deleted file mode 100644
index 31fb09f..0000000
--- a/src/views/measure/source/components/listPage.vue
+++ /dev/null
@@ -1,372 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType, IlistTypes } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: '0',
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([])
-// 总数
-const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 表头
-const columns = ref([
-  {
-    text: '溯源供方编号',
-    value: 'supplierNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '溯源供方名称',
-    value: 'supplierName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '业务内容',
-    value: 'businessContent',
-    align: 'center',
-  },
-  {
-    text: '业务范围',
-    value: 'businessScope',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '联系方式',
-    value: 'phone',
-    align: 'center',
-  },
-  {
-    text: '地址',
-    value: 'address',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 初始化路由
-const $router = useRouter()
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const pageTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (pageType === '删除') {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-      else {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '取消成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-    })
-}
-
-const approvalDialog = ref()
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    // applyShow.value = true
-    approvalDialog.value.initDialog('agree', '1')
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 点击搜索
-const searchList = () => {
-  fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    approvalStatus: '',
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    formId: '1',
-    supplierName: '',
-    supplierNo: '',
-    offset: 1,
-    limit: 20,
-  }
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  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 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 upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-
-const add = () => {
-  $router.push('/source/approve/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="溯源供方编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="溯源供方名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="业务内容"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="地址"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </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" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-</template>
-
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
deleted file mode 100644
index 289b3e4..0000000
--- a/src/views/measure/source/components/listPageAdd.vue
+++ /dev/null
@@ -1,729 +0,0 @@
-<script lang="ts" setup name="ListpageSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline, traceSupplierPerson } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { UploadFile } from '@/api/measure/file'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
-  traceSupplierPersonList: [],
-})
-const ruleFormRef = ref<FormInstance>()
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
-const columns = [
-  { text: '人员编号', value: 'personNo' },
-  { text: '姓名', value: 'name' },
-  { text: '工作部门', value: 'department' },
-  { text: '职务', value: 'job' },
-  { text: '联系方式', value: 'phone' },
-]
-// 控制审批弹窗开关
-const applyShow = ref(false)
-const rules = ref({
-  supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const provinceList = ref([])
-const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const getInfo = () => {
-  getSoucreListDetail({ id: infoId.value }).then((res) => {
-    // formInline.value = res.data
-  })
-}
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 获取公司地址省级
-const getCompanyAddress = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    provinceList.value = res.data
-  })
-}
-// 公司地址省级的值发生改变
-const changeProvince = (e: any) => {
-  cityList.value = []
-  areaList.value = []
-  formInline.value.companyCity = ''
-  formInline.value.companyArea = ''
-
-  getSoucreListlevelType(e).then((res) => {
-    cityList.value = res.data
-  })
-}
-// 公司地址市级发生改变
-const cityChange = (e: any) => {
-  areaList.value = []
-  formInline.value.companyArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaList.value = res.data
-  })
-}
-// 获取到开票地址省级
-const getinvoiceProvinceList = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    invoiceProvince.value = res.data
-  })
-}
-// 开票地址省级发生改变
-const changeInvoice = (e: any) => {
-  formInline.value.invoiceCity = ''
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    invoiceCityList.value = res.data
-  })
-}
-// 开票地址市级发生改变
-const invoiceCityChange = (e: string) => {
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaInvoiceList.value = res.data
-  })
-}
-// 点击增加行
-const addRow = () => {
-  // 检查上一行必填项
-  if (checkPersonList()) {
-    setAllRowReadable()
-    traceSupplierPersonList.value.push({ ...addPersonObj })
-  }
-}
-// 检查人员列表
-function checkPersonList() {
-  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
-    const item = traceSupplierPersonList.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
-    return !SelectionList.value.includes(item)
-  })
-}
-// 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log('6666')
-  if (type === '提交' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getSoucreListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (type === '提交' && pageType.value !== 'edit') {
-    formInline.value.id = infoId.value
-    getSoucreLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-// 双击行显示输入框
-const dblclickRow = (row: traceSupplierPerson) => {
-  setAllRowReadable()
-  row.editable = true
-}
-// 将所有人员信息列表置为不可编辑状态
-function setAllRowReadable() {
-  for (const item of traceSupplierPersonList.value) {
-    item.editable = false
-  }
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        label-width="auto"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="溯源供方编号:" prop="supplierNo">
-              <el-input
-                v-model="formInline.supplierNo"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税号:" prop="taxNumber">
-              <el-input
-                v-model="formInline.taxNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮编:">
-              <el-input
-                v-model="formInline.postalCode"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="手机:">
-              <el-input
-                v-model="formInline.mobile"
-                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司名称:" prop="supplierName">
-              <el-input
-                v-model="formInline.supplierName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账户名:">
-              <el-input
-                v-model="formInline.bankAccount"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="负责人:">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮箱:">
-              <el-input
-                v-model="formInline.mailbox"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司简称:">
-              <el-input
-                v-model="formInline.briefName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行名称:">
-              <el-input
-                v-model="formInline.bankName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="电话:">
-              <el-input
-                v-model="formInline.phone"
-                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="网址:">
-              <el-input
-                v-model="formInline.website"
-                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="业务内容:" prop="businessContent">
-              <el-input
-                v-model="formInline.businessContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账号:">
-              <el-input
-                v-model="formInline.bankAccountNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真:">
-              <el-input
-                v-model="formInline.fax"
-                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="公司地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getCompanyAddress('0')"
-                @change="changeProvince"
-              >
-                <el-option
-                  v-for="province in provinceList"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="cityChange"
-              >
-                <el-option
-                  v-for="city in cityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.companyAddress"
-                placeholder="公司详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="开票地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getinvoiceProvinceList('0')"
-                @change="changeInvoice"
-              >
-                <el-option
-                  v-for="province in invoiceProvince"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="invoiceCityChange"
-              >
-                <el-option
-                  v-for="city in invoiceCityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaInvoiceList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.invoiceAddress"
-                placeholder="开票详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="公司业务范围:">
-              <el-input
-                v-model="formInline.businessScope"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入公司业务范围'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="traceSupplierPersonList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .content-top {
-    display: flex;
-    justify-content: space-around;
-  }
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.el-select {
-  width: 9vw;
-  margin-right: 15px;
-}
-
-.info-dizhi .el-input {
-  width: 20vw;
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.info-appendix span {
-  margin-right: 25px;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/source/components/manageBox.vue b/src/views/measure/source/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/source/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/measure/source/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/measure/source/components/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/measure/source/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
new file mode 100644
index 0000000..3880028
--- /dev/null
+++ b/src/views/measure/source/components/listApproval.vue
@@ -0,0 +1,332 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '业务范围', value: 'businessScope', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '联系方式', value: 'phone', align: 'center' },
+  { text: '地址', value: 'address', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/source/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="溯源供方编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="溯源供方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
deleted file mode 100644
index 31fb09f..0000000
--- a/src/views/measure/source/components/listPage.vue
+++ /dev/null
@@ -1,372 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType, IlistTypes } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: '0',
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([])
-// 总数
-const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 表头
-const columns = ref([
-  {
-    text: '溯源供方编号',
-    value: 'supplierNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '溯源供方名称',
-    value: 'supplierName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '业务内容',
-    value: 'businessContent',
-    align: 'center',
-  },
-  {
-    text: '业务范围',
-    value: 'businessScope',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '联系方式',
-    value: 'phone',
-    align: 'center',
-  },
-  {
-    text: '地址',
-    value: 'address',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 初始化路由
-const $router = useRouter()
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const pageTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (pageType === '删除') {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-      else {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '取消成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-    })
-}
-
-const approvalDialog = ref()
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    // applyShow.value = true
-    approvalDialog.value.initDialog('agree', '1')
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 点击搜索
-const searchList = () => {
-  fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    approvalStatus: '',
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    formId: '1',
-    supplierName: '',
-    supplierNo: '',
-    offset: 1,
-    limit: 20,
-  }
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  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 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 upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-
-const add = () => {
-  $router.push('/source/approve/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="溯源供方编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="溯源供方名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="业务内容"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="地址"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </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" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-</template>
-
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
deleted file mode 100644
index 289b3e4..0000000
--- a/src/views/measure/source/components/listPageAdd.vue
+++ /dev/null
@@ -1,729 +0,0 @@
-<script lang="ts" setup name="ListpageSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline, traceSupplierPerson } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { UploadFile } from '@/api/measure/file'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
-  traceSupplierPersonList: [],
-})
-const ruleFormRef = ref<FormInstance>()
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
-const columns = [
-  { text: '人员编号', value: 'personNo' },
-  { text: '姓名', value: 'name' },
-  { text: '工作部门', value: 'department' },
-  { text: '职务', value: 'job' },
-  { text: '联系方式', value: 'phone' },
-]
-// 控制审批弹窗开关
-const applyShow = ref(false)
-const rules = ref({
-  supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const provinceList = ref([])
-const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const getInfo = () => {
-  getSoucreListDetail({ id: infoId.value }).then((res) => {
-    // formInline.value = res.data
-  })
-}
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 获取公司地址省级
-const getCompanyAddress = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    provinceList.value = res.data
-  })
-}
-// 公司地址省级的值发生改变
-const changeProvince = (e: any) => {
-  cityList.value = []
-  areaList.value = []
-  formInline.value.companyCity = ''
-  formInline.value.companyArea = ''
-
-  getSoucreListlevelType(e).then((res) => {
-    cityList.value = res.data
-  })
-}
-// 公司地址市级发生改变
-const cityChange = (e: any) => {
-  areaList.value = []
-  formInline.value.companyArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaList.value = res.data
-  })
-}
-// 获取到开票地址省级
-const getinvoiceProvinceList = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    invoiceProvince.value = res.data
-  })
-}
-// 开票地址省级发生改变
-const changeInvoice = (e: any) => {
-  formInline.value.invoiceCity = ''
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    invoiceCityList.value = res.data
-  })
-}
-// 开票地址市级发生改变
-const invoiceCityChange = (e: string) => {
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaInvoiceList.value = res.data
-  })
-}
-// 点击增加行
-const addRow = () => {
-  // 检查上一行必填项
-  if (checkPersonList()) {
-    setAllRowReadable()
-    traceSupplierPersonList.value.push({ ...addPersonObj })
-  }
-}
-// 检查人员列表
-function checkPersonList() {
-  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
-    const item = traceSupplierPersonList.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
-    return !SelectionList.value.includes(item)
-  })
-}
-// 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log('6666')
-  if (type === '提交' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getSoucreListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (type === '提交' && pageType.value !== 'edit') {
-    formInline.value.id = infoId.value
-    getSoucreLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-// 双击行显示输入框
-const dblclickRow = (row: traceSupplierPerson) => {
-  setAllRowReadable()
-  row.editable = true
-}
-// 将所有人员信息列表置为不可编辑状态
-function setAllRowReadable() {
-  for (const item of traceSupplierPersonList.value) {
-    item.editable = false
-  }
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        label-width="auto"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="溯源供方编号:" prop="supplierNo">
-              <el-input
-                v-model="formInline.supplierNo"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税号:" prop="taxNumber">
-              <el-input
-                v-model="formInline.taxNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮编:">
-              <el-input
-                v-model="formInline.postalCode"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="手机:">
-              <el-input
-                v-model="formInline.mobile"
-                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司名称:" prop="supplierName">
-              <el-input
-                v-model="formInline.supplierName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账户名:">
-              <el-input
-                v-model="formInline.bankAccount"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="负责人:">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮箱:">
-              <el-input
-                v-model="formInline.mailbox"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司简称:">
-              <el-input
-                v-model="formInline.briefName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行名称:">
-              <el-input
-                v-model="formInline.bankName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="电话:">
-              <el-input
-                v-model="formInline.phone"
-                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="网址:">
-              <el-input
-                v-model="formInline.website"
-                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="业务内容:" prop="businessContent">
-              <el-input
-                v-model="formInline.businessContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账号:">
-              <el-input
-                v-model="formInline.bankAccountNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真:">
-              <el-input
-                v-model="formInline.fax"
-                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="公司地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getCompanyAddress('0')"
-                @change="changeProvince"
-              >
-                <el-option
-                  v-for="province in provinceList"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="cityChange"
-              >
-                <el-option
-                  v-for="city in cityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.companyAddress"
-                placeholder="公司详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="开票地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getinvoiceProvinceList('0')"
-                @change="changeInvoice"
-              >
-                <el-option
-                  v-for="province in invoiceProvince"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="invoiceCityChange"
-              >
-                <el-option
-                  v-for="city in invoiceCityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaInvoiceList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.invoiceAddress"
-                placeholder="开票详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="公司业务范围:">
-              <el-input
-                v-model="formInline.businessScope"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入公司业务范围'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="traceSupplierPersonList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .content-top {
-    display: flex;
-    justify-content: space-around;
-  }
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.el-select {
-  width: 9vw;
-  margin-right: 15px;
-}
-
-.info-dizhi .el-input {
-  width: 20vw;
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.info-appendix span {
-  margin-right: 25px;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/source/components/manageBox.vue b/src/views/measure/source/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/source/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/measure/source/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/measure/source/components/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
new file mode 100644
index 0000000..28cd56c
--- /dev/null
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -0,0 +1,621 @@
+<script lang="ts" setup name="SourceApprovalDetail">
+// 溯源供方审批详情
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListDetail, getSoucreListlevelType } from '@/api/measure/source'
+import { submitApproval } from '@/api/approval'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<IButton[]>([])
+const pageType = ref('detail') // 页面类型: detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  2: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+  ],
+  3: [
+    { name: '取消', type: 'primary' },
+  ],
+}
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  const status = $route.params.type
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 溯源供方详情表单
+const dataForm = ref<ISupplier>({
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
+  traceSupplierPersonList: [],
+})
+// 获取表单详情
+const getInfo = () => {
+  getSoucreListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    if (dataForm.value.approvalStatus) {
+      // 待审批
+      if (dataForm.value.approvalStatus == '2') {
+        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+      }
+      else if (dataForm.value.approvalStatus == '3') { // 审批中
+        // todo：判断当前用户是否为发起人
+        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+      }
+    }
+  })
+}
+getInfo()
+
+const ruleFormRef = ref<FormInstance>()
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const columns = [
+  { text: '人员编号', value: 'personNo' },
+  { text: '姓名', value: 'name' },
+  { text: '工作部门', value: 'department' },
+  { text: '职务', value: 'job' },
+  { text: '联系方式', value: 'phone' },
+]
+
+const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
+const cityList = ref([])
+const areaList = ref([])
+const invoiceProvince = ref([])
+const invoiceCityList = ref([])
+const areaInvoiceList = ref([])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+
+// 获取公司地址省级
+const getCompanyAddress = (type: string) => {
+  getSoucreListlevelType(type).then((res) => {
+    provinceList.value = res.data
+  })
+}
+// 公司地址省级的值发生改变
+const changeProvince = (e: any) => {
+  cityList.value = []
+  areaList.value = []
+  dataForm.value.companyCity = ''
+  dataForm.value.companyArea = ''
+
+  getSoucreListlevelType(e).then((res) => {
+    cityList.value = res.data
+  })
+}
+// 公司地址市级发生改变
+const cityChange = (e: any) => {
+  areaList.value = []
+  dataForm.value.companyArea = ''
+  getSoucreListlevelType(e).then((res) => {
+    areaList.value = res.data
+  })
+}
+// 获取到开票地址省级
+const getinvoiceProvinceList = (type: string) => {
+  getSoucreListlevelType(type).then((res) => {
+    invoiceProvince.value = res.data
+  })
+}
+// 开票地址省级发生改变
+const changeInvoice = (e: any) => {
+  dataForm.value.invoiceCity = ''
+  dataForm.value.invoiceArea = ''
+  getSoucreListlevelType(e).then((res) => {
+    invoiceCityList.value = res.data
+  })
+}
+// 开票地址市级发生改变
+const invoiceCityChange = (e: string) => {
+  dataForm.value.invoiceArea = ''
+  getSoucreListlevelType(e).then((res) => {
+    areaInvoiceList.value = res.data
+  })
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: dataForm.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="溯源供方审批">
+      <template #btns>
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="dataForm"
+        class="demo-form-inline"
+        label-width="auto"
+        label-position="right"
+        :rules="rules"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="溯源供方编号:" prop="supplierNo">
+              <el-input
+                v-model="dataForm.supplierNo"
+                :placeholder="
+                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
+                "
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="税号:" prop="taxNumber">
+              <el-input
+                v-model="dataForm.taxNumber"
+                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="邮编:">
+              <el-input
+                v-model="dataForm.postalCode"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="手机:">
+              <el-input
+                v-model="dataForm.mobile"
+                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="公司名称:" prop="supplierName">
+              <el-input
+                v-model="dataForm.supplierName"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="dataForm.bankAccount"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="负责人:">
+              <el-input
+                v-model="dataForm.director"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="邮箱:">
+              <el-input
+                v-model="dataForm.mailbox"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="公司简称:">
+              <el-input
+                v-model="dataForm.briefName"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="银行名称:">
+              <el-input
+                v-model="dataForm.bankName"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电话:">
+              <el-input
+                v-model="dataForm.phone"
+                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="网址:">
+              <el-input
+                v-model="dataForm.website"
+                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="业务内容:" prop="businessContent">
+              <el-input
+                v-model="dataForm.businessContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="dataForm.bankAccountNumber"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传真:">
+              <el-input
+                v-model="dataForm.fax"
+                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-form-item label="公司地址:">
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyCountry" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyProvince" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyCity" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyArea" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="8">
+              <el-input
+                v-model="dataForm.companyAddress"
+                placeholder="公司详细地址"
+                :disabled="pageType === 'detail'"
+              />
+            </el-col>
+          </el-form-item>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-form-item label="开票地址:">
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceCountry"
+                placeholder="国别"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option label="中国" value="中国" />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceProvince"
+                placeholder="省"
+                :disabled="pageType === 'detail'"
+                @click="getinvoiceProvinceList('0')"
+                @change="changeInvoice"
+              >
+                <el-option
+                  v-for="province in invoiceProvince"
+                  :key="province.id"
+                  :label="province.areaName"
+                  :value="province.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceCity"
+                placeholder="市"
+                :disabled="pageType === 'detail'"
+                @change="invoiceCityChange"
+              >
+                <el-option
+                  v-for="city in invoiceCityList"
+                  :key="city.id"
+                  :label="city.areaName"
+                  :value="city.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceArea"
+                placeholder="区/县"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="area in areaInvoiceList"
+                  :key="area.id"
+                  :label="area.areaName"
+                  :value="area.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="8">
+              <el-input
+                v-model="dataForm.invoiceAddress"
+                placeholder="开票详细地址"
+                :disabled="pageType === 'detail'"
+              />
+            </el-col>
+          </el-form-item>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="公司业务范围:">
+              <el-input
+                v-model="dataForm.businessScope"
+                :placeholder="
+                  pageType === 'detail' ? '无' : '请输入公司业务范围'
+                "
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="备注:">
+              <el-input
+                v-model="dataForm.remark"
+                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+              <span>无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <detail-block title="人员信息">
+      <el-table
+        :data="traceSupplierPersonList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #default="scope">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/measure/source/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
new file mode 100644
index 0000000..3880028
--- /dev/null
+++ b/src/views/measure/source/components/listApproval.vue
@@ -0,0 +1,332 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '业务范围', value: 'businessScope', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '联系方式', value: 'phone', align: 'center' },
+  { text: '地址', value: 'address', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/source/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="溯源供方编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="溯源供方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
deleted file mode 100644
index 31fb09f..0000000
--- a/src/views/measure/source/components/listPage.vue
+++ /dev/null
@@ -1,372 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType, IlistTypes } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: '0',
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([])
-// 总数
-const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 表头
-const columns = ref([
-  {
-    text: '溯源供方编号',
-    value: 'supplierNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '溯源供方名称',
-    value: 'supplierName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '业务内容',
-    value: 'businessContent',
-    align: 'center',
-  },
-  {
-    text: '业务范围',
-    value: 'businessScope',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '联系方式',
-    value: 'phone',
-    align: 'center',
-  },
-  {
-    text: '地址',
-    value: 'address',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 初始化路由
-const $router = useRouter()
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const pageTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (pageType === '删除') {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-      else {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '取消成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-    })
-}
-
-const approvalDialog = ref()
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    // applyShow.value = true
-    approvalDialog.value.initDialog('agree', '1')
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 点击搜索
-const searchList = () => {
-  fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    approvalStatus: '',
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    formId: '1',
-    supplierName: '',
-    supplierNo: '',
-    offset: 1,
-    limit: 20,
-  }
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  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 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 upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-
-const add = () => {
-  $router.push('/source/approve/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="溯源供方编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="溯源供方名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="业务内容"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="地址"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </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" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-</template>
-
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
deleted file mode 100644
index 289b3e4..0000000
--- a/src/views/measure/source/components/listPageAdd.vue
+++ /dev/null
@@ -1,729 +0,0 @@
-<script lang="ts" setup name="ListpageSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline, traceSupplierPerson } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { UploadFile } from '@/api/measure/file'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
-  traceSupplierPersonList: [],
-})
-const ruleFormRef = ref<FormInstance>()
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
-const columns = [
-  { text: '人员编号', value: 'personNo' },
-  { text: '姓名', value: 'name' },
-  { text: '工作部门', value: 'department' },
-  { text: '职务', value: 'job' },
-  { text: '联系方式', value: 'phone' },
-]
-// 控制审批弹窗开关
-const applyShow = ref(false)
-const rules = ref({
-  supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const provinceList = ref([])
-const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const getInfo = () => {
-  getSoucreListDetail({ id: infoId.value }).then((res) => {
-    // formInline.value = res.data
-  })
-}
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 获取公司地址省级
-const getCompanyAddress = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    provinceList.value = res.data
-  })
-}
-// 公司地址省级的值发生改变
-const changeProvince = (e: any) => {
-  cityList.value = []
-  areaList.value = []
-  formInline.value.companyCity = ''
-  formInline.value.companyArea = ''
-
-  getSoucreListlevelType(e).then((res) => {
-    cityList.value = res.data
-  })
-}
-// 公司地址市级发生改变
-const cityChange = (e: any) => {
-  areaList.value = []
-  formInline.value.companyArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaList.value = res.data
-  })
-}
-// 获取到开票地址省级
-const getinvoiceProvinceList = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    invoiceProvince.value = res.data
-  })
-}
-// 开票地址省级发生改变
-const changeInvoice = (e: any) => {
-  formInline.value.invoiceCity = ''
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    invoiceCityList.value = res.data
-  })
-}
-// 开票地址市级发生改变
-const invoiceCityChange = (e: string) => {
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaInvoiceList.value = res.data
-  })
-}
-// 点击增加行
-const addRow = () => {
-  // 检查上一行必填项
-  if (checkPersonList()) {
-    setAllRowReadable()
-    traceSupplierPersonList.value.push({ ...addPersonObj })
-  }
-}
-// 检查人员列表
-function checkPersonList() {
-  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
-    const item = traceSupplierPersonList.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
-    return !SelectionList.value.includes(item)
-  })
-}
-// 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log('6666')
-  if (type === '提交' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getSoucreListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (type === '提交' && pageType.value !== 'edit') {
-    formInline.value.id = infoId.value
-    getSoucreLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-// 双击行显示输入框
-const dblclickRow = (row: traceSupplierPerson) => {
-  setAllRowReadable()
-  row.editable = true
-}
-// 将所有人员信息列表置为不可编辑状态
-function setAllRowReadable() {
-  for (const item of traceSupplierPersonList.value) {
-    item.editable = false
-  }
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        label-width="auto"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="溯源供方编号:" prop="supplierNo">
-              <el-input
-                v-model="formInline.supplierNo"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税号:" prop="taxNumber">
-              <el-input
-                v-model="formInline.taxNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮编:">
-              <el-input
-                v-model="formInline.postalCode"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="手机:">
-              <el-input
-                v-model="formInline.mobile"
-                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司名称:" prop="supplierName">
-              <el-input
-                v-model="formInline.supplierName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账户名:">
-              <el-input
-                v-model="formInline.bankAccount"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="负责人:">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮箱:">
-              <el-input
-                v-model="formInline.mailbox"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司简称:">
-              <el-input
-                v-model="formInline.briefName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行名称:">
-              <el-input
-                v-model="formInline.bankName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="电话:">
-              <el-input
-                v-model="formInline.phone"
-                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="网址:">
-              <el-input
-                v-model="formInline.website"
-                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="业务内容:" prop="businessContent">
-              <el-input
-                v-model="formInline.businessContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账号:">
-              <el-input
-                v-model="formInline.bankAccountNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真:">
-              <el-input
-                v-model="formInline.fax"
-                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="公司地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getCompanyAddress('0')"
-                @change="changeProvince"
-              >
-                <el-option
-                  v-for="province in provinceList"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="cityChange"
-              >
-                <el-option
-                  v-for="city in cityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.companyAddress"
-                placeholder="公司详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="开票地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getinvoiceProvinceList('0')"
-                @change="changeInvoice"
-              >
-                <el-option
-                  v-for="province in invoiceProvince"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="invoiceCityChange"
-              >
-                <el-option
-                  v-for="city in invoiceCityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaInvoiceList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.invoiceAddress"
-                placeholder="开票详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="公司业务范围:">
-              <el-input
-                v-model="formInline.businessScope"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入公司业务范围'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="traceSupplierPersonList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .content-top {
-    display: flex;
-    justify-content: space-around;
-  }
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.el-select {
-  width: 9vw;
-  margin-right: 15px;
-}
-
-.info-dizhi .el-input {
-  width: 20vw;
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.info-appendix span {
-  margin-right: 25px;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/source/components/manageBox.vue b/src/views/measure/source/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/source/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/measure/source/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/measure/source/components/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
new file mode 100644
index 0000000..28cd56c
--- /dev/null
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -0,0 +1,621 @@
+<script lang="ts" setup name="SourceApprovalDetail">
+// 溯源供方审批详情
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListDetail, getSoucreListlevelType } from '@/api/measure/source'
+import { submitApproval } from '@/api/approval'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<IButton[]>([])
+const pageType = ref('detail') // 页面类型: detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  2: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+  ],
+  3: [
+    { name: '取消', type: 'primary' },
+  ],
+}
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  const status = $route.params.type
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 溯源供方详情表单
+const dataForm = ref<ISupplier>({
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
+  traceSupplierPersonList: [],
+})
+// 获取表单详情
+const getInfo = () => {
+  getSoucreListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    if (dataForm.value.approvalStatus) {
+      // 待审批
+      if (dataForm.value.approvalStatus == '2') {
+        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+      }
+      else if (dataForm.value.approvalStatus == '3') { // 审批中
+        // todo：判断当前用户是否为发起人
+        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+      }
+    }
+  })
+}
+getInfo()
+
+const ruleFormRef = ref<FormInstance>()
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const columns = [
+  { text: '人员编号', value: 'personNo' },
+  { text: '姓名', value: 'name' },
+  { text: '工作部门', value: 'department' },
+  { text: '职务', value: 'job' },
+  { text: '联系方式', value: 'phone' },
+]
+
+const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
+const cityList = ref([])
+const areaList = ref([])
+const invoiceProvince = ref([])
+const invoiceCityList = ref([])
+const areaInvoiceList = ref([])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+
+// 获取公司地址省级
+const getCompanyAddress = (type: string) => {
+  getSoucreListlevelType(type).then((res) => {
+    provinceList.value = res.data
+  })
+}
+// 公司地址省级的值发生改变
+const changeProvince = (e: any) => {
+  cityList.value = []
+  areaList.value = []
+  dataForm.value.companyCity = ''
+  dataForm.value.companyArea = ''
+
+  getSoucreListlevelType(e).then((res) => {
+    cityList.value = res.data
+  })
+}
+// 公司地址市级发生改变
+const cityChange = (e: any) => {
+  areaList.value = []
+  dataForm.value.companyArea = ''
+  getSoucreListlevelType(e).then((res) => {
+    areaList.value = res.data
+  })
+}
+// 获取到开票地址省级
+const getinvoiceProvinceList = (type: string) => {
+  getSoucreListlevelType(type).then((res) => {
+    invoiceProvince.value = res.data
+  })
+}
+// 开票地址省级发生改变
+const changeInvoice = (e: any) => {
+  dataForm.value.invoiceCity = ''
+  dataForm.value.invoiceArea = ''
+  getSoucreListlevelType(e).then((res) => {
+    invoiceCityList.value = res.data
+  })
+}
+// 开票地址市级发生改变
+const invoiceCityChange = (e: string) => {
+  dataForm.value.invoiceArea = ''
+  getSoucreListlevelType(e).then((res) => {
+    areaInvoiceList.value = res.data
+  })
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: dataForm.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="溯源供方审批">
+      <template #btns>
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="dataForm"
+        class="demo-form-inline"
+        label-width="auto"
+        label-position="right"
+        :rules="rules"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="溯源供方编号:" prop="supplierNo">
+              <el-input
+                v-model="dataForm.supplierNo"
+                :placeholder="
+                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
+                "
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="税号:" prop="taxNumber">
+              <el-input
+                v-model="dataForm.taxNumber"
+                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="邮编:">
+              <el-input
+                v-model="dataForm.postalCode"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="手机:">
+              <el-input
+                v-model="dataForm.mobile"
+                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="公司名称:" prop="supplierName">
+              <el-input
+                v-model="dataForm.supplierName"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="dataForm.bankAccount"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="负责人:">
+              <el-input
+                v-model="dataForm.director"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="邮箱:">
+              <el-input
+                v-model="dataForm.mailbox"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="公司简称:">
+              <el-input
+                v-model="dataForm.briefName"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="银行名称:">
+              <el-input
+                v-model="dataForm.bankName"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电话:">
+              <el-input
+                v-model="dataForm.phone"
+                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="网址:">
+              <el-input
+                v-model="dataForm.website"
+                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="业务内容:" prop="businessContent">
+              <el-input
+                v-model="dataForm.businessContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="dataForm.bankAccountNumber"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传真:">
+              <el-input
+                v-model="dataForm.fax"
+                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-form-item label="公司地址:">
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyCountry" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyProvince" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyCity" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyArea" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="8">
+              <el-input
+                v-model="dataForm.companyAddress"
+                placeholder="公司详细地址"
+                :disabled="pageType === 'detail'"
+              />
+            </el-col>
+          </el-form-item>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-form-item label="开票地址:">
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceCountry"
+                placeholder="国别"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option label="中国" value="中国" />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceProvince"
+                placeholder="省"
+                :disabled="pageType === 'detail'"
+                @click="getinvoiceProvinceList('0')"
+                @change="changeInvoice"
+              >
+                <el-option
+                  v-for="province in invoiceProvince"
+                  :key="province.id"
+                  :label="province.areaName"
+                  :value="province.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceCity"
+                placeholder="市"
+                :disabled="pageType === 'detail'"
+                @change="invoiceCityChange"
+              >
+                <el-option
+                  v-for="city in invoiceCityList"
+                  :key="city.id"
+                  :label="city.areaName"
+                  :value="city.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceArea"
+                placeholder="区/县"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="area in areaInvoiceList"
+                  :key="area.id"
+                  :label="area.areaName"
+                  :value="area.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="8">
+              <el-input
+                v-model="dataForm.invoiceAddress"
+                placeholder="开票详细地址"
+                :disabled="pageType === 'detail'"
+              />
+            </el-col>
+          </el-form-item>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="公司业务范围:">
+              <el-input
+                v-model="dataForm.businessScope"
+                :placeholder="
+                  pageType === 'detail' ? '无' : '请输入公司业务范围'
+                "
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="备注:">
+              <el-input
+                v-model="dataForm.remark"
+                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+              <span>无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <detail-block title="人员信息">
+      <el-table
+        :data="traceSupplierPersonList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #default="scope">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index fe9cf57..c7bd2f1 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -3,7 +3,8 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
@@ -22,7 +23,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '溯源供方编号',
     value: 'supplierNo',
@@ -64,7 +65,7 @@
     text: '创建时间',
     value: 'createTime',
     align: 'center',
-    width: '200',
+    width: '180',
   },
   {
     text: '备注',
@@ -74,7 +75,7 @@
 ])
 
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
 // 删除id
@@ -99,7 +100,7 @@
 fetchData(true)
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
+  checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 // 点击编辑id和删除row类型
 interface rowReturn {
@@ -159,20 +160,20 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else if (checkoutList.value.length > 0) {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
+  //   exportExcel({
+  //     json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+  //     name: '溯源供方',
+  //     titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+  //     sheetName: 'sheet1',
+  //   })
+  // }
+  // else if (checkoutList.value.length > 0) {
+  //   exportExcel({
+  //     json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+  //     name: '溯源供方',
+  //     titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+  //     sheetName: 'sheet1',
+  //   })
   }
   else {
     ElMessage.warning('暂无数据')
@@ -276,7 +277,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/measure/source/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
new file mode 100644
index 0000000..3880028
--- /dev/null
+++ b/src/views/measure/source/components/listApproval.vue
@@ -0,0 +1,332 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '业务范围', value: 'businessScope', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '联系方式', value: 'phone', align: 'center' },
+  { text: '地址', value: 'address', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/source/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="溯源供方编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="溯源供方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
deleted file mode 100644
index 31fb09f..0000000
--- a/src/views/measure/source/components/listPage.vue
+++ /dev/null
@@ -1,372 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType, IlistTypes } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: '0',
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([])
-// 总数
-const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 表头
-const columns = ref([
-  {
-    text: '溯源供方编号',
-    value: 'supplierNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '溯源供方名称',
-    value: 'supplierName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '业务内容',
-    value: 'businessContent',
-    align: 'center',
-  },
-  {
-    text: '业务范围',
-    value: 'businessScope',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '联系方式',
-    value: 'phone',
-    align: 'center',
-  },
-  {
-    text: '地址',
-    value: 'address',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 初始化路由
-const $router = useRouter()
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const pageTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (pageType === '删除') {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-      else {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '取消成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-    })
-}
-
-const approvalDialog = ref()
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    // applyShow.value = true
-    approvalDialog.value.initDialog('agree', '1')
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 点击搜索
-const searchList = () => {
-  fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    approvalStatus: '',
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    formId: '1',
-    supplierName: '',
-    supplierNo: '',
-    offset: 1,
-    limit: 20,
-  }
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  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 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 upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-
-const add = () => {
-  $router.push('/source/approve/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="溯源供方编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="溯源供方名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="业务内容"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="地址"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </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" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-</template>
-
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
deleted file mode 100644
index 289b3e4..0000000
--- a/src/views/measure/source/components/listPageAdd.vue
+++ /dev/null
@@ -1,729 +0,0 @@
-<script lang="ts" setup name="ListpageSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline, traceSupplierPerson } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { UploadFile } from '@/api/measure/file'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
-  traceSupplierPersonList: [],
-})
-const ruleFormRef = ref<FormInstance>()
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
-const columns = [
-  { text: '人员编号', value: 'personNo' },
-  { text: '姓名', value: 'name' },
-  { text: '工作部门', value: 'department' },
-  { text: '职务', value: 'job' },
-  { text: '联系方式', value: 'phone' },
-]
-// 控制审批弹窗开关
-const applyShow = ref(false)
-const rules = ref({
-  supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const provinceList = ref([])
-const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const getInfo = () => {
-  getSoucreListDetail({ id: infoId.value }).then((res) => {
-    // formInline.value = res.data
-  })
-}
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 获取公司地址省级
-const getCompanyAddress = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    provinceList.value = res.data
-  })
-}
-// 公司地址省级的值发生改变
-const changeProvince = (e: any) => {
-  cityList.value = []
-  areaList.value = []
-  formInline.value.companyCity = ''
-  formInline.value.companyArea = ''
-
-  getSoucreListlevelType(e).then((res) => {
-    cityList.value = res.data
-  })
-}
-// 公司地址市级发生改变
-const cityChange = (e: any) => {
-  areaList.value = []
-  formInline.value.companyArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaList.value = res.data
-  })
-}
-// 获取到开票地址省级
-const getinvoiceProvinceList = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    invoiceProvince.value = res.data
-  })
-}
-// 开票地址省级发生改变
-const changeInvoice = (e: any) => {
-  formInline.value.invoiceCity = ''
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    invoiceCityList.value = res.data
-  })
-}
-// 开票地址市级发生改变
-const invoiceCityChange = (e: string) => {
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaInvoiceList.value = res.data
-  })
-}
-// 点击增加行
-const addRow = () => {
-  // 检查上一行必填项
-  if (checkPersonList()) {
-    setAllRowReadable()
-    traceSupplierPersonList.value.push({ ...addPersonObj })
-  }
-}
-// 检查人员列表
-function checkPersonList() {
-  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
-    const item = traceSupplierPersonList.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
-    return !SelectionList.value.includes(item)
-  })
-}
-// 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log('6666')
-  if (type === '提交' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getSoucreListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (type === '提交' && pageType.value !== 'edit') {
-    formInline.value.id = infoId.value
-    getSoucreLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-// 双击行显示输入框
-const dblclickRow = (row: traceSupplierPerson) => {
-  setAllRowReadable()
-  row.editable = true
-}
-// 将所有人员信息列表置为不可编辑状态
-function setAllRowReadable() {
-  for (const item of traceSupplierPersonList.value) {
-    item.editable = false
-  }
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        label-width="auto"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="溯源供方编号:" prop="supplierNo">
-              <el-input
-                v-model="formInline.supplierNo"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税号:" prop="taxNumber">
-              <el-input
-                v-model="formInline.taxNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮编:">
-              <el-input
-                v-model="formInline.postalCode"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="手机:">
-              <el-input
-                v-model="formInline.mobile"
-                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司名称:" prop="supplierName">
-              <el-input
-                v-model="formInline.supplierName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账户名:">
-              <el-input
-                v-model="formInline.bankAccount"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="负责人:">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮箱:">
-              <el-input
-                v-model="formInline.mailbox"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司简称:">
-              <el-input
-                v-model="formInline.briefName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行名称:">
-              <el-input
-                v-model="formInline.bankName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="电话:">
-              <el-input
-                v-model="formInline.phone"
-                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="网址:">
-              <el-input
-                v-model="formInline.website"
-                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="业务内容:" prop="businessContent">
-              <el-input
-                v-model="formInline.businessContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账号:">
-              <el-input
-                v-model="formInline.bankAccountNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真:">
-              <el-input
-                v-model="formInline.fax"
-                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="公司地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getCompanyAddress('0')"
-                @change="changeProvince"
-              >
-                <el-option
-                  v-for="province in provinceList"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="cityChange"
-              >
-                <el-option
-                  v-for="city in cityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.companyAddress"
-                placeholder="公司详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="开票地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getinvoiceProvinceList('0')"
-                @change="changeInvoice"
-              >
-                <el-option
-                  v-for="province in invoiceProvince"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="invoiceCityChange"
-              >
-                <el-option
-                  v-for="city in invoiceCityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaInvoiceList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.invoiceAddress"
-                placeholder="开票详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="公司业务范围:">
-              <el-input
-                v-model="formInline.businessScope"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入公司业务范围'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="traceSupplierPersonList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .content-top {
-    display: flex;
-    justify-content: space-around;
-  }
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.el-select {
-  width: 9vw;
-  margin-right: 15px;
-}
-
-.info-dizhi .el-input {
-  width: 20vw;
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.info-appendix span {
-  margin-right: 25px;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/source/components/manageBox.vue b/src/views/measure/source/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/source/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/measure/source/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/measure/source/components/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
new file mode 100644
index 0000000..28cd56c
--- /dev/null
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -0,0 +1,621 @@
+<script lang="ts" setup name="SourceApprovalDetail">
+// 溯源供方审批详情
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListDetail, getSoucreListlevelType } from '@/api/measure/source'
+import { submitApproval } from '@/api/approval'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<IButton[]>([])
+const pageType = ref('detail') // 页面类型: detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  2: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+  ],
+  3: [
+    { name: '取消', type: 'primary' },
+  ],
+}
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  const status = $route.params.type
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 溯源供方详情表单
+const dataForm = ref<ISupplier>({
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
+  traceSupplierPersonList: [],
+})
+// 获取表单详情
+const getInfo = () => {
+  getSoucreListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    if (dataForm.value.approvalStatus) {
+      // 待审批
+      if (dataForm.value.approvalStatus == '2') {
+        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+      }
+      else if (dataForm.value.approvalStatus == '3') { // 审批中
+        // todo：判断当前用户是否为发起人
+        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+      }
+    }
+  })
+}
+getInfo()
+
+const ruleFormRef = ref<FormInstance>()
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const columns = [
+  { text: '人员编号', value: 'personNo' },
+  { text: '姓名', value: 'name' },
+  { text: '工作部门', value: 'department' },
+  { text: '职务', value: 'job' },
+  { text: '联系方式', value: 'phone' },
+]
+
+const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
+const cityList = ref([])
+const areaList = ref([])
+const invoiceProvince = ref([])
+const invoiceCityList = ref([])
+const areaInvoiceList = ref([])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+
+// 获取公司地址省级
+const getCompanyAddress = (type: string) => {
+  getSoucreListlevelType(type).then((res) => {
+    provinceList.value = res.data
+  })
+}
+// 公司地址省级的值发生改变
+const changeProvince = (e: any) => {
+  cityList.value = []
+  areaList.value = []
+  dataForm.value.companyCity = ''
+  dataForm.value.companyArea = ''
+
+  getSoucreListlevelType(e).then((res) => {
+    cityList.value = res.data
+  })
+}
+// 公司地址市级发生改变
+const cityChange = (e: any) => {
+  areaList.value = []
+  dataForm.value.companyArea = ''
+  getSoucreListlevelType(e).then((res) => {
+    areaList.value = res.data
+  })
+}
+// 获取到开票地址省级
+const getinvoiceProvinceList = (type: string) => {
+  getSoucreListlevelType(type).then((res) => {
+    invoiceProvince.value = res.data
+  })
+}
+// 开票地址省级发生改变
+const changeInvoice = (e: any) => {
+  dataForm.value.invoiceCity = ''
+  dataForm.value.invoiceArea = ''
+  getSoucreListlevelType(e).then((res) => {
+    invoiceCityList.value = res.data
+  })
+}
+// 开票地址市级发生改变
+const invoiceCityChange = (e: string) => {
+  dataForm.value.invoiceArea = ''
+  getSoucreListlevelType(e).then((res) => {
+    areaInvoiceList.value = res.data
+  })
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: dataForm.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="溯源供方审批">
+      <template #btns>
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="dataForm"
+        class="demo-form-inline"
+        label-width="auto"
+        label-position="right"
+        :rules="rules"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="溯源供方编号:" prop="supplierNo">
+              <el-input
+                v-model="dataForm.supplierNo"
+                :placeholder="
+                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
+                "
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="税号:" prop="taxNumber">
+              <el-input
+                v-model="dataForm.taxNumber"
+                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="邮编:">
+              <el-input
+                v-model="dataForm.postalCode"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="手机:">
+              <el-input
+                v-model="dataForm.mobile"
+                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="公司名称:" prop="supplierName">
+              <el-input
+                v-model="dataForm.supplierName"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="dataForm.bankAccount"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="负责人:">
+              <el-input
+                v-model="dataForm.director"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="邮箱:">
+              <el-input
+                v-model="dataForm.mailbox"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="公司简称:">
+              <el-input
+                v-model="dataForm.briefName"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="银行名称:">
+              <el-input
+                v-model="dataForm.bankName"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电话:">
+              <el-input
+                v-model="dataForm.phone"
+                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="网址:">
+              <el-input
+                v-model="dataForm.website"
+                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="业务内容:" prop="businessContent">
+              <el-input
+                v-model="dataForm.businessContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="dataForm.bankAccountNumber"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传真:">
+              <el-input
+                v-model="dataForm.fax"
+                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-form-item label="公司地址:">
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyCountry" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyProvince" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyCity" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyArea" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="8">
+              <el-input
+                v-model="dataForm.companyAddress"
+                placeholder="公司详细地址"
+                :disabled="pageType === 'detail'"
+              />
+            </el-col>
+          </el-form-item>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-form-item label="开票地址:">
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceCountry"
+                placeholder="国别"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option label="中国" value="中国" />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceProvince"
+                placeholder="省"
+                :disabled="pageType === 'detail'"
+                @click="getinvoiceProvinceList('0')"
+                @change="changeInvoice"
+              >
+                <el-option
+                  v-for="province in invoiceProvince"
+                  :key="province.id"
+                  :label="province.areaName"
+                  :value="province.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceCity"
+                placeholder="市"
+                :disabled="pageType === 'detail'"
+                @change="invoiceCityChange"
+              >
+                <el-option
+                  v-for="city in invoiceCityList"
+                  :key="city.id"
+                  :label="city.areaName"
+                  :value="city.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceArea"
+                placeholder="区/县"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="area in areaInvoiceList"
+                  :key="area.id"
+                  :label="area.areaName"
+                  :value="area.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="8">
+              <el-input
+                v-model="dataForm.invoiceAddress"
+                placeholder="开票详细地址"
+                :disabled="pageType === 'detail'"
+              />
+            </el-col>
+          </el-form-item>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="公司业务范围:">
+              <el-input
+                v-model="dataForm.businessScope"
+                :placeholder="
+                  pageType === 'detail' ? '无' : '请输入公司业务范围'
+                "
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="备注:">
+              <el-input
+                v-model="dataForm.remark"
+                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+              <span>无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <detail-block title="人员信息">
+      <el-table
+        :data="traceSupplierPersonList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #default="scope">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index fe9cf57..c7bd2f1 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -3,7 +3,8 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
@@ -22,7 +23,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '溯源供方编号',
     value: 'supplierNo',
@@ -64,7 +65,7 @@
     text: '创建时间',
     value: 'createTime',
     align: 'center',
-    width: '200',
+    width: '180',
   },
   {
     text: '备注',
@@ -74,7 +75,7 @@
 ])
 
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
 // 删除id
@@ -99,7 +100,7 @@
 fetchData(true)
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
+  checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 // 点击编辑id和删除row类型
 interface rowReturn {
@@ -159,20 +160,20 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else if (checkoutList.value.length > 0) {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
+  //   exportExcel({
+  //     json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+  //     name: '溯源供方',
+  //     titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+  //     sheetName: 'sheet1',
+  //   })
+  // }
+  // else if (checkoutList.value.length > 0) {
+  //   exportExcel({
+  //     json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+  //     name: '溯源供方',
+  //     titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+  //     sheetName: 'sheet1',
+  //   })
   }
   else {
     ElMessage.warning('暂无数据')
@@ -276,7 +277,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index c8ba746..cb8bbe3 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -5,12 +5,13 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
+import type { IOptions, ISupplier, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { getSoucreLisListExport, getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,7 +29,7 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<IformInline> = ref({
+const formInline: Ref<ISupplier> = ref({
   id: '',
   businessContent: '',
   supplierName: '',
@@ -43,7 +44,6 @@
   companyCity: '',
   companyCountry: '',
   companyProvince: '',
-  createTime: '',
   director: '',
   fax: '',
   invoiceAddress: '',
@@ -91,7 +91,6 @@
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
   supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
   businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
   taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
@@ -203,48 +202,59 @@
   })
 }
 // 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
+function exportForm() {
+  const params = {
+    businessContent: formInline.value.businessContent,
+    supplierName: formInline.value.supplierName,
+    supplierNo: formInline.value.supplierNo,
+  }
+  getSoucreLisListExport(params).then((res) => {
+    exportFile(res.data, '溯源供方详情')
+  })
+}
+
+// 保存至草稿箱
+function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
       ).then(() => {
-        if (type === '提交' && pageType.value !== 'edit') {
-          getSoucreListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        }
-        else if (type === '提交' && pageType.value === 'edit') {
-          formInline.value.id = infoId.value
-          getSoucreLisUpdate(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        }
-        else {
-          const params = {
-            businessContent: formInline.value.businessContent,
-            supplierName: formInline.value.supplierName,
-            supplierNo: formInline.value.supplierNo,
+        sourceSave(formInline.value).then((res) => {
+          if (res.code === 200) {
+            formInline.value.id = res.data.id
+            formInline.value.supplierNo = res.data.supplierNo
+            ElMessage.success('已保存')
           }
-          getSoucreLisListExport(params).then((res) => {
-            exportFile(res.data, '溯源供方详情')
-          })
-        }
+        })
       })
     }
   })
 }
+
+// 提交表单
+function submitForm() {
+  if (formInline.value.id) {
+    const params = {
+      id: formInline.value.id,
+      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
+    }
+    sourceSubmit(params).then((res) => {
+      ElMessage.success('提交成功')
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
@@ -293,13 +303,14 @@
   <app-container>
     <detail-page :title="`溯源供方-${textMap[pageType]}`">
       <template #btns>
-        <el-button
-          type="primary"
-          @click="
-            getAddList(ruleFormRef, pageType === 'detail' ? '导出' : '提交')
-          "
-        >
-          {{ pageType === 'detail' ? '导出' : '提交' }}
+        <el-button type="primary" @click="exportForm">
+          导出
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -319,9 +330,9 @@
               <el-input
                 v-model="formInline.supplierNo"
                 :placeholder="
-                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
+                  pageType === 'detail' ? '无' : '系统自动生成'
                 "
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>

diff --git a/src/api/measure/source.ts b/src/api/measure/source.ts
new file mode 100644
index 0000000..1b8bf27
--- /dev/null
+++ b/src/api/measure/source.ts
@@ -0,0 +1,84 @@
+/**
+ * 溯源供方请求接口
+ */
+import request from '../index'
+const prefix = '/meter'
+
+// 列表查询
+export function getSoucreList(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 数据删除
+export function getSoucreListDelete(data: object) {
+  return request({
+    url: `${prefix}/supplier/delete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 查看详情
+export function getSoucreListDetail(data: object) {
+  return request({
+    url: `${prefix}/supplier/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 省级联动
+export function getSoucreListlevelType(pid: string) {
+  return request({
+    url: `/sys/area/list?pid=${pid}`,
+    method: 'get',
+  })
+}
+
+// 提交数据
+export function sourceSubmit(data: object) {
+  return request({
+    url: '/meter/supplier/submit',
+    method: 'post',
+    data,
+  })
+}
+// 保存数据
+export function sourceSave(data: object) {
+  return request({
+    url: `${prefix}/supplier/save`,
+    method: 'post',
+    data,
+  })
+}
+// 更新数据
+export function getSoucreLisUpdate(data: object) {
+  return request({
+    url: `${prefix}/supplier/update`,
+    method: 'post',
+    data,
+  })
+}
+
+// 导出详情
+export function getSoucreLisListExport(data: object) {
+  return request({
+    url: `${prefix}/supplier/listExport`,
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 溯源供方审批接口
+export function getapprovalListPage(data: { offset: number; limit: number }) {
+  return request({
+    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/api/system/source.ts b/src/api/system/source.ts
deleted file mode 100644
index 93f5f12..0000000
--- a/src/api/system/source.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * 溯源供方请求接口
- */
-import request from '../index'
-const prefix = '/meter'
-
-// 列表查询
-export function getSoucreList(data: object) {
-  return request({
-    url: `${prefix}/supplier/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
-
-// 数据删除
-export function getSoucreListDelete(data: object) {
-  return request({
-    url: `${prefix}/supplier/delete`,
-    method: 'post',
-    data,
-  })
-}
-
-// 查看详情
-export function getSoucreListDetail(data: object) {
-  return request({
-    url: `${prefix}/supplier/detail`,
-    method: 'post',
-    data,
-  })
-}
-
-// 省级联动
-export function getSoucreListlevelType(pid: string) {
-  return request({
-    url: `/sys/area/list?pid=${pid}`,
-    method: 'get',
-  })
-}
-
-// 新增数据
-export function getSoucreListAdd(data: object) {
-  return request({
-    url: `${prefix}/supplier/add`,
-    method: 'post',
-    data,
-  })
-}
-// 更新数据
-export function getSoucreLisUpdate(data: object) {
-  return request({
-    url: `${prefix}/supplier/update`,
-    method: 'post',
-    data,
-  })
-}
-
-// 导出详情
-export function getSoucreLisListExport(data: object) {
-  return request({
-    url: `${prefix}/supplier/listExport`,
-    method: 'post',
-    responseType: 'blob',
-    data,
-  })
-}
-
-// 溯源供方审批接口
-export function getapprovalListPage(data: object) {
-  return request({
-    url: `${prefix}/supplier/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
-    method: 'post',
-    data,
-  })
-}
diff --git a/src/components.d.ts b/src/components.d.ts
index 280906e..d419887 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -55,7 +55,6 @@
     SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
     SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
     SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
-    SelectTree: typeof import('./components/SelectTree/index.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
     SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
     TableContainer: typeof import('./components/TableContainer/index.vue')['default']
diff --git a/src/router/modules/measure.ts b/src/router/modules/measure.ts
index f114ca2..73a7470 100644
--- a/src/router/modules/measure.ts
+++ b/src/router/modules/measure.ts
@@ -423,7 +423,7 @@
       {
         path: 'approve/:type/:id?',
         name: 'ListpageSourceAdd',
-        component: () => import('@/views/measure/source/components/listPageAdd.vue'),
+        component: () => import('@/views/measure/source/components/sourceApprovalDetail.vue'),
         meta: {
           title: '溯源供方审批',
           icon: 'ep:key',
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
index 7de3b8b..0719c75 100644
--- a/src/store/modules/dict.ts
+++ b/src/store/modules/dict.ts
@@ -6,6 +6,15 @@
     state: () => ({
       allDeptList: [] as DeptTreeNode[], // 所有部门列表
       companyList: [] as DeptTreeNode[], // 公司列表
+      approvalStatusList: {
+        全部: '0',
+        草稿箱: '1',
+        待审批: '2',
+        审批中: '3',
+        已通过: '4',
+        未通过: '5',
+        已取消: '6',
+      }, // 审批状态
     }),
     getters: {
       getAllDeptList: (state) => {
@@ -14,6 +23,9 @@
       getCompanyList: (state) => {
         return state.companyList
       },
+      getApprovalStatus: (state) => {
+        return state.approvalStatusList
+      },
     },
     actions: {
       setAllDeptList(list: DeptTreeNode[]) {
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 21d3721..9db0c6b 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -2,19 +2,19 @@
  * 流程字典， 流程代号：流程id
  */
 export enum SCHEDULE {
-  FILE_APPROVAL = '1', // 文件审批,
-  TRAIN_APPROVAL = '2', // 培训计划审批
-  SUPPLIER_APPROVAL = '3', // 溯源供方审批
-  STANDARD_CHANGE_APPROVAL = '4', // 标准装置更换申请
-  STANDARD_PAUSE_APPROVAL = '5', // 标准装置暂停申请
-  STANDARD_REVERT_APPROVAL = '6', // 标准装置撤销申请
-  STANDARD_RESUME_APPROVAL = '7', // 标准装置恢复申请
-  STANDARD_CHECK_APPROVAL = '8', // 标准装置复查申请
-  DEVICE_UNUSED_APPROVAL = '9', // 设备闲置申请
-  DEVICE_SEALED_APPROVAL = '10', // 设备封存申请
-  DEVICE_UNSEALED_APPROVAL = '11', // 设备启封申请
-  DEVICE_SCRAPPED_ROVAL = '12', // 设备报废申请
-  DEVICE_HANDLE_APPROVAL = '13', // 设备处置申请
-  DEVICE_CONSUMING_APPROVAL = '14', // 设备领用申请
-  DEVICE_BORROW_APPROVAL = '15', // 设备借用申请
+  FILE_APPROVAL = 'jlglwjsp', // 文件审批,
+  TRAIN_APPROVAL = 'jlglpxjhsp', // 培训计划审批
+  SUPPLIER_APPROVAL = 'jlglsygfsp', // 溯源供方审批
+  STANDARD_CHANGE_APPROVAL = 'sbglbzzzghsq', // 标准装置更换申请
+  STANDARD_PAUSE_APPROVAL = 'sbglbzzzghsq', // 标准装置暂停申请
+  STANDARD_REVERT_APPROVAL = 'sbglbzzzghsq', // 标准装置撤销申请
+  STANDARD_RESUME_APPROVAL = 'sbglbzzzghsq', // 标准装置恢复申请
+  STANDARD_CHECK_APPROVAL = 'sbglbzzzfcsq', // 标准装置复查申请
+  DEVICE_UNUSED_APPROVAL = 'sbglsbxzsq', // 设备闲置申请
+  DEVICE_SEALED_APPROVAL = 'sbglsbfcsq', // 设备封存申请
+  DEVICE_UNSEALED_APPROVAL = 'sbglsbqfsq', // 设备启封申请
+  DEVICE_SCRAPPED_ROVAL = 'sbglsbbfsq', // 设备报废申请
+  DEVICE_HANDLE_APPROVAL = 'sbglsbczsq', // 设备处置申请
+  DEVICE_CONSUMING_APPROVAL = 'sbglsblysq', // 设备领用申请
+  DEVICE_BORROW_APPROVAL = 'sbglsbjysq', // 设备借用申请
 }
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 6227626..9ac8eea 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -1,52 +1,88 @@
-<script lang="ts" setup name="approve">
-import All from './components/all.vue' // 全部
-import DraftBox from './components/draftBox.vue' // 草稿箱
-import ApprovalPending from './components/approvalPending.vue'// 待审批
-import ExamineAndApprove from './components/examineAndApprove.vue' // 审批中
-import Passed from './components/passed.vue'// 已通过
-import NotPass from './components/notPass.vue' // 技术能力
-import Canceled from './components/canceled.vue' // 取消
-export interface menuType {
+<script lang="ts" setup name="sourceApprove">
+// 溯源供方审批里诶博爱
+import ListApproval from './components/listApproval.vue' // 全部
+import type { IButton } from './list_interface'
+import useDictStore from '@/store/modules/dict'
+const dictStore = useDictStore()
+interface MenuType {
   name: string
-  comp: any
+  value: any
 }
-const menu = ref<menuType[]>([
-  { name: '全部', comp: All },
-  { name: '草稿箱', comp: DraftBox },
-  { name: '待审批', comp: ApprovalPending },
-  { name: '审批中', comp: ExamineAndApprove },
-  { name: '已通过', comp: Passed },
-  { name: '未通过', comp: NotPass },
-  { name: '已取消', comp: Canceled },
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
 ])
-const current = ref('全部')
-const currentComp = shallowRef(All)
-watch(current, (newValue) => {
-  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
-})
-const disabled = ref(false)
-const setData = (newIsShow) => {
-  if (newIsShow === false) {
-    disabled.value = true
-  }
-  else {
-    disabled.value = false
-  }
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
 }
+// 当前tab
+const currentTab = ref<'全部' | '草稿箱' | '待审批' | '已通过' | '未通过' | '已取消'>('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+})
 </script>
 
 <template>
   <div class="container">
     <div class="btns">
-      <!-- 三级菜单 -->
-      <el-radio-group v-model="current" :disabled="disabled">
-        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
           {{ item.name }}
         </el-radio-button>
       </el-radio-group>
     </div>
     <!-- 展示区域 -->
-    <component :is="currentComp" @setData="setData" />
+    <list-approval :name="currentTab" :status="currentApprovalStatus" :buttons="currentButtons" />
   </div>
 </template>
 
@@ -55,8 +91,8 @@
   position: relative;
 
   .btns {
-    position: fixed;
-    top: 76px;
+    position: absolute;
+    top: -41px;
     right: 15px;
     z-index: 999;
   }
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
deleted file mode 100644
index d124307..0000000
--- a/src/views/measure/source/components/all.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 全部 -->
-<script lang="ts" setup name="all">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="全部" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
deleted file mode 100644
index 8a7a8bc..0000000
--- a/src/views/measure/source/components/approvalPending.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- 待审批 -->
-<script lang="ts" setup name="approvalPending">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="待审批" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
deleted file mode 100644
index 3b9657c..0000000
--- a/src/views/measure/source/components/canceled.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 取消 -->
-<script lang="ts" setup name="canceled">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="已取消" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
deleted file mode 100644
index 43d7b75..0000000
--- a/src/views/measure/source/components/draftBox.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 草稿箱 -->
-<script lang="ts" setup name="draftBox">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '编辑', type: 'primary' },
-  { name: '提交', type: 'primary' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="草稿箱" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
deleted file mode 100644
index c13f95a..0000000
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 审批中 -->
-<script lang="ts" setup name="examineAndApprove">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([
-  { name: '查看', type: 'primary' },
-  { name: '同意', type: 'primary' },
-  { name: '驳回', type: 'primary' },
-  { name: '拒绝', type: 'danger' },
-  { name: '取消', type: 'info' },
-  { name: '删除', type: 'danger' },
-])
-</script>
-
-<template>
-  <list-page name="审批中" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/listApproval.vue b/src/views/measure/source/components/listApproval.vue
new file mode 100644
index 0000000..3880028
--- /dev/null
+++ b/src/views/measure/source/components/listApproval.vue
@@ -0,0 +1,332 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox, buttonEmits } from 'element-plus'
+import type { IButton, ISupplier, IlistType, IlistTypes, supplierExportQuery } from '../list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 32 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref<ISupplier[]>([])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '溯源供方编号', value: 'supplierNo', width: '120', align: 'center' },
+  { text: '溯源供方名称', value: 'supplierName', width: '120', align: 'center' },
+  { text: '业务内容', value: 'businessContent', align: 'center' },
+  { text: '业务范围', value: 'businessScope', align: 'center' },
+  { text: '负责人', value: 'director', align: 'center' },
+  { text: '联系方式', value: 'phone', align: 'center' },
+  { text: '地址', value: 'address', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 文件上传input
+const fileRef = ref()
+// 删除id
+const deleteId = ref('')
+// 详情id
+const infoId = ref('0')
+// 点击按钮
+const buttonType = ref('')
+const loadingTable = ref(false)
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    list.value = [
+      { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/source/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    fetchData(false)
+  },
+  { immediate: true })
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方列表', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="溯源供方编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="溯源供方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="业务内容" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="地址" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
deleted file mode 100644
index 31fb09f..0000000
--- a/src/views/measure/source/components/listPage.vue
+++ /dev/null
@@ -1,372 +0,0 @@
-<script lang="ts" setup name="ListSource">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IlistType, IlistTypes } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import { getSoucreListDelete, getapprovalListPage } from '@/api/system/source'
-import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
-import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { SCHEDULE } from '@/utils/scheduleDict'
-const props = defineProps({
-  name: {
-    type: String,
-    default: '全部',
-  },
-  buttoms: {
-    type: Array,
-    default: () => [],
-  },
-})
-const emit = defineEmits(['setData']) // 关闭
-// 查询条件
-const listQuery: Ref<IlistTypes> = ref({
-  approvalStatus: '0',
-  businessContent: '',
-  companyArea: '',
-  companyCity: '',
-  companyProvince: '',
-  formId: SCHEDULE.SUPPLIER_APPROVAL,
-  supplierName: '',
-  supplierNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 控制是否显示新增页面
-const show = ref(true)
-// 表格数据
-const list = ref([])
-// 总数
-const total = ref(0)
-// 控制审批操作弹窗的开关
-const applyShow = ref(false)
-// 表头
-const columns = ref([
-  {
-    text: '溯源供方编号',
-    value: 'supplierNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '溯源供方名称',
-    value: 'supplierName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '业务内容',
-    value: 'businessContent',
-    align: 'center',
-  },
-  {
-    text: '业务范围',
-    value: 'businessScope',
-    align: 'center',
-  },
-  {
-    text: '负责人',
-    value: 'director',
-    align: 'center',
-  },
-  {
-    text: '联系方式',
-    value: 'phone',
-    align: 'center',
-  },
-  {
-    text: '地址',
-    value: 'address',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'name',
-    align: 'center',
-  },
-  {
-    text: '备注',
-    value: 'name',
-    align: 'center',
-  },
-])
-// 初始化路由
-const $router = useRouter()
-const buttonArray = ref<string[]>([])
-// 选中的内容
-const checkoutList = ref([])
-// 文件上传input
-const fileRef = ref()
-// 删除id
-const deleteId = ref('')
-// 详情id
-const infoId = ref('0')
-// 点击按钮
-const buttonType = ref('')
-const loadingTable = ref(false)
-const fetchData = (isNowPage: boolean) => {
-  loadingTable.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.value.offset = 1
-  }
-  getapprovalListPage(listQuery.value).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    loadingTable.value = false
-  })
-}
-// fetchData(true)
-// 多选发生改变时
-const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
-}
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const pageTypeMap = ref('')
-// 点击删除或者取消
-const handleDelete = (row: rowReturn, pageType: string) => {
-  ElMessageBox.confirm(
-    `确认${pageType}${row.supplierName}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      if (pageType === '删除') {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '删除成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-      else {
-        getSoucreListDelete({ id: row.id as string }).then((res) => {
-          if (res.code === 200) {
-            ElMessage({
-              type: 'success',
-              message: '取消成功',
-            })
-            fetchData(true)
-          }
-        })
-      }
-    })
-}
-
-const approvalDialog = ref()
-// 点击每条数据操作
-const handleEdit = (row: rowReturn, pageType: string) => {
-  if (pageType === '编辑' || pageType === '查看') {
-    pageTypeMap.value = pageType === '编辑' ? 'edit' : 'detail'
-    $router.push(`/source/approve/${pageTypeMap.value}/${row.id}`)
-  }
-  else if (pageType === '同意' || pageType === '驳回' || pageType === '拒绝') {
-    // applyShow.value = true
-    approvalDialog.value.initDialog('agree', '1')
-  }
-  else {
-    handleDelete(row, pageType)
-  }
-}
-// 点击搜索
-const searchList = () => {
-  fetchData(true)
-}
-const cancelEvent = () => {
-  console.log('cancel!')
-}
-// 点击重置
-const clearList = () => {
-  listQuery.value = {
-    approvalStatus: '',
-    businessContent: '',
-    companyArea: '',
-    companyCity: '',
-    companyProvince: '',
-    formId: '1',
-    supplierName: '',
-    supplierNo: '',
-    offset: 1,
-    limit: 20,
-  }
-}
-// 导出
-const exportExcelBtn = () => {
-  const loading = ElLoading.service({
-    lock: true,
-    text: 'Loading',
-    background: 'rgba(255, 255, 255, 0.8)',
-  })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  loading.close()
-}
-// 上传文件/批量导入
-const onFileChange = (event: any) => {
-  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 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 upload = () => {
-  fileRef.value.click()
-}
-const uploadAll = () => {
-  upload()
-}
-
-const add = () => {
-  $router.push('/source/approve/add')
-}
-const exportAll = () => {
-  exportExcelBtn()
-}
-// 审批结束回调
-const approvalSuccess = () => {
-  fetchData(true)
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-watch(() => show.value, (newVal) => {
-// 变化后存储
-  emit('setData', newVal)
-},
-{ deep: true, immediate: true })
-// 打印
-const printObj = ref({
-  id: 'print', // 需要打印元素的id
-  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
-</script>
-
-<template>
-  <div v-if="show">
-    <app-container>
-      <search-area
-        :need-clear="true"
-        @search="searchList" @clear="clearList"
-      >
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierNo"
-            placeholder="溯源供方编号"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.supplierName"
-            placeholder="溯源供方名称"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="业务内容"
-            clearable
-          />
-        </search-item>
-        <search-item>
-          <el-input
-            v-model.trim="listQuery.businessContent"
-            placeholder="地址"
-            clearable
-          />
-        </search-item>
-      </search-area>
-      <table-container>
-        <template #btns-right>
-          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
-          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
-          <icon-button v-print="printObj" icon="icon-print" title="打印" type="primary" />
-        </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" @multiSelect="handleSelectionChange"
-        >
-          <template #columns>
-            <el-table-column label="操作" align="center" width="300">
-              <template #default="{ row }">
-                <el-button
-                  v-for="(item, index) in buttoms"
-                  :key="index"
-                  size="small"
-                  :type="item.type" link
-                  @click="handleEdit(row, item.name)"
-                >
-                  {{ item.name }}
-                </el-button>
-              </template>
-            </el-table-column>
-          </template>
-        </normal-table>
-      </table-container>
-    </app-container>
-  </div>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-</template>
-
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
deleted file mode 100644
index 289b3e4..0000000
--- a/src/views/measure/source/components/listPageAdd.vue
+++ /dev/null
@@ -1,729 +0,0 @@
-<script lang="ts" setup name="ListpageSourceAdd">
-import { reactive, ref } from 'vue'
-import type { Ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IformInline, traceSupplierPerson } from '../list_interface'
-import ManageBox from './manageBox.vue'
-import showPhoto from '@/views/system/tool/showPhoto.vue'
-import { exportFile } from '@/utils/exportUtils'
-import { UploadFile } from '@/api/measure/file'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
-const loading = ref(false) // 表单加载状态
-const infoId = ref('') // id
-const buttonArray = ref<string[]>([])
-const pageType = ref('add') // 页面类型: add,edit, detail
-const buttonLoading = ref(false) // 按钮加载状态
-const textMap: { [key: string]: string } = {
-  add: '新建',
-  edit: '编辑',
-  detail: '详情',
-}// 字典
-// 从路由中获取页面类型参数
-const $route = useRoute()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type as string
-  if (pageType.value === 'detail') {
-    buttonArray.value = ['同意', '驳回', '拒绝']
-  }
-  else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
-  }
-  else {
-    buttonArray.value = ['提交']
-  }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
-  }
-}
-const formInline = ref({
-  businessContent: null,
-  supplierName: null,
-  supplierNo: null,
-  bankAccount: null,
-  bankAccountNumber: null,
-  bankName: null,
-  briefName: null,
-  businessScope: null,
-  companyAddress: null,
-  companyArea: null,
-  companyCity: null,
-  companyCountry: null,
-  companyProvince: null,
-  createTime: null,
-  director: null,
-  fax: null,
-  invoiceAddress: null,
-  invoiceArea: null,
-  invoiceCity: null,
-  invoiceCountry: null,
-  invoiceProvince: null,
-  mailbox: null,
-  minioFileName: null,
-  mobile: null,
-  phone: null,
-  postalCode: null,
-  remark: null,
-  taxNumber: null,
-  website: null,
-  traceSupplierPersonList: [],
-})
-const ruleFormRef = ref<FormInstance>()
-const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
-const columns = [
-  { text: '人员编号', value: 'personNo' },
-  { text: '姓名', value: 'name' },
-  { text: '工作部门', value: 'department' },
-  { text: '职务', value: 'job' },
-  { text: '联系方式', value: 'phone' },
-]
-// 控制审批弹窗开关
-const applyShow = ref(false)
-const rules = ref({
-  supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
-  supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
-  businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
-  taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
-}) // 表单验证规则
-const provinceList = ref([])
-const fileList = ref<UploadUserFile[]>([])
-const cityList = ref([])
-const areaList = ref([])
-const invoiceProvince = ref([])
-const invoiceCityList = ref([])
-const areaInvoiceList = ref([])
-const dialogVisible = ref(false)
-const addPersonList = ref({
-  personNo: '',
-  name: '',
-  department: '',
-  job: '',
-  phone: '',
-})
-const SelectionList = ref([])
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
-}
-const getInfo = () => {
-  getSoucreListDetail({ id: infoId.value }).then((res) => {
-    // formInline.value = res.data
-  })
-}
-// 表格选中
-const handleSelectionChange = (e: any) => {
-  SelectionList.value = e
-}
-// 获取公司地址省级
-const getCompanyAddress = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    provinceList.value = res.data
-  })
-}
-// 公司地址省级的值发生改变
-const changeProvince = (e: any) => {
-  cityList.value = []
-  areaList.value = []
-  formInline.value.companyCity = ''
-  formInline.value.companyArea = ''
-
-  getSoucreListlevelType(e).then((res) => {
-    cityList.value = res.data
-  })
-}
-// 公司地址市级发生改变
-const cityChange = (e: any) => {
-  areaList.value = []
-  formInline.value.companyArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaList.value = res.data
-  })
-}
-// 获取到开票地址省级
-const getinvoiceProvinceList = (type: string) => {
-  getSoucreListlevelType(type).then((res) => {
-    invoiceProvince.value = res.data
-  })
-}
-// 开票地址省级发生改变
-const changeInvoice = (e: any) => {
-  formInline.value.invoiceCity = ''
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    invoiceCityList.value = res.data
-  })
-}
-// 开票地址市级发生改变
-const invoiceCityChange = (e: string) => {
-  formInline.value.invoiceArea = ''
-  getSoucreListlevelType(e).then((res) => {
-    areaInvoiceList.value = res.data
-  })
-}
-// 点击增加行
-const addRow = () => {
-  // 检查上一行必填项
-  if (checkPersonList()) {
-    setAllRowReadable()
-    traceSupplierPersonList.value.push({ ...addPersonObj })
-  }
-}
-// 检查人员列表
-function checkPersonList() {
-  for (let index = 0; index < traceSupplierPersonList.value.length; index++) {
-    const item = traceSupplierPersonList.value[index]
-    for (const prop of columns.value) {
-      // 检查必填
-      if (prop.required && !item[prop.value]) {
-        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
-        return false
-      }
-      // 验证正则
-      if (prop.reg && typeof prop.reg === 'function') {
-        if (!prop.reg(item[prop.value])) {
-          ElMessage.warning(`第${index + 1}行中${prop.text}输入不合法`)
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
-  handleVisibleClose()
-}
-// 删除行
-const deleteList = () => {
-  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
-    return !SelectionList.value.includes(item)
-  })
-}
-// 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
-  console.log('6666')
-  if (type === '提交' && pageType.value === 'edit') {
-    if (!formEl) { return }
-    await formEl.validate((valid, fields) => {
-      if (valid) {
-        ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-        ).then(() => {
-          getSoucreListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        })
-      }
-    })
-  }
-  else if (type === '提交' && pageType.value !== 'edit') {
-    formInline.value.id = infoId.value
-    getSoucreLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    applyShow.value = true
-  }
-}
-// 审批弹窗关闭
-const handleClose = () => {
-  applyShow.value = false
-}
-// 点击审批的提交
-const applyListSubmit = (row: any) => {
-  console.log(row)
-  handleClose()
-}
-const fileRef = ref() // 文件上传input
-const onFileChange = (event: any) => {
-  // 原生上传
-  console.log(event.target.files)
-  if (event.target.files?.length !== 0) {
-    // 创建formdata对象
-    const fd = new FormData()
-    fd.append('multipartFile', event.target.files[0])
-    UploadFile(fd).then((res) => {
-      if (res.code === 200) {
-        formInline.value.minioFileName = res.data[0]
-        // 重置当前验证
-        ElMessage.success('文件上传成功')
-      }
-      else {
-        ElMessage.error(res.message)
-      }
-    })
-  }
-}
-const upload = () => {
-  fileRef.value.click()
-}
-// 双击行显示输入框
-const dblclickRow = (row: traceSupplierPerson) => {
-  setAllRowReadable()
-  row.editable = true
-}
-// 将所有人员信息列表置为不可编辑状态
-function setAllRowReadable() {
-  for (const item of traceSupplierPersonList.value) {
-    item.editable = false
-  }
-}
-if (pageType.value !== 'add') {
-  getInfo()
-}
-</script>
-
-<template>
-  <app-container>
-    <detail-page :title="`培训计划审批-${textMap[pageType]}`">
-      <template #btns>
-        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
-          {{ item }}
-        </el-button>
-        <el-button type="info" @click="close">
-          关闭
-        </el-button>
-      </template>
-      <el-form
-        ref="ruleFormRef"
-        :model="formInline"
-        class="demo-form-inline"
-        label-width="auto"
-        label-position="right"
-        :rules="rules"
-      >
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="溯源供方编号:" prop="supplierNo">
-              <el-input
-                v-model="formInline.supplierNo"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="税号:" prop="taxNumber">
-              <el-input
-                v-model="formInline.taxNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮编:">
-              <el-input
-                v-model="formInline.postalCode"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="手机:">
-              <el-input
-                v-model="formInline.mobile"
-                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司名称:" prop="supplierName">
-              <el-input
-                v-model="formInline.supplierName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账户名:">
-              <el-input
-                v-model="formInline.bankAccount"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="负责人:">
-              <el-input
-                v-model="formInline.director"
-                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="邮箱:">
-              <el-input
-                v-model="formInline.mailbox"
-                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="公司简称:">
-              <el-input
-                v-model="formInline.briefName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行名称:">
-              <el-input
-                v-model="formInline.bankName"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="电话:">
-              <el-input
-                v-model="formInline.phone"
-                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="网址:">
-              <el-input
-                v-model="formInline.website"
-                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="业务内容:" prop="businessContent">
-              <el-input
-                v-model="formInline.businessContent"
-                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="银行账号:">
-              <el-input
-                v-model="formInline.bankAccountNumber"
-                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="传真:">
-              <el-input
-                v-model="formInline.fax"
-                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="公司地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getCompanyAddress('0')"
-                @change="changeProvince"
-              >
-                <el-option
-                  v-for="province in provinceList"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="cityChange"
-              >
-                <el-option
-                  v-for="city in cityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.companyArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.companyAddress"
-                placeholder="公司详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-form-item label="开票地址:">
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCountry"
-                placeholder="国别"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option label="中国" value="中国" />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceProvince"
-                placeholder="省"
-                :disabled="pageType === 'detail'"
-                @click="getinvoiceProvinceList('0')"
-                @change="changeInvoice"
-              >
-                <el-option
-                  v-for="province in invoiceProvince"
-                  :key="province.id"
-                  :label="province.areaName"
-                  :value="province.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceCity"
-                placeholder="市"
-                :disabled="pageType === 'detail'"
-                @change="invoiceCityChange"
-              >
-                <el-option
-                  v-for="city in invoiceCityList"
-                  :key="city.id"
-                  :label="city.areaName"
-                  :value="city.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="formInline.invoiceArea"
-                placeholder="区/县"
-                :disabled="pageType === 'detail'"
-              >
-                <el-option
-                  v-for="area in areaInvoiceList"
-                  :key="area.id"
-                  :label="area.areaName"
-                  :value="area.id"
-                />
-              </el-select>
-            </el-col>
-            <el-col :span="8">
-              <el-input
-                v-model="formInline.invoiceAddress"
-                placeholder="开票详细地址"
-                :disabled="pageType === 'detail'"
-              />
-            </el-col>
-          </el-form-item>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="公司业务范围:">
-              <el-input
-                v-model="formInline.businessScope"
-                :placeholder="
-                  pageType === 'detail' ? '无' : '请输入公司业务范围'
-                "
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="备注:">
-              <el-input
-                v-model="formInline.remark"
-                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
-                :disabled="pageType === 'detail'"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="14">
-            <el-form-item label="附件:">
-              <show-photo :minio-file-name="formInline.minioFileName" />
-              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === null ? '0px' : '20px' }" @click="upload">
-                {{ formInline.minioFileName === null ? '上传' : '更换附件' }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </detail-page>
-    <detail-block title="人员信息">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button type="info" @click="deleteList">
-          删除行
-        </el-button>
-        <el-button type="primary" @click="addRoow">
-          增加行
-        </el-button>
-      </template>
-      <el-table
-        :data="traceSupplierPersonList"
-        border
-        style="width: 100%;"
-        @selection-change="handleSelectionChange"
-        @row-dblclick="dblclickRow"
-      >
-        <el-table-column type="selection" width="38" />
-        <el-table-column align="center" label="序号" width="80" type="index" />
-        <el-table-column
-          v-for="item in columns"
-          :key="item.value"
-          :prop="item.value"
-          :label="item.text"
-          align="center"
-        >
-          <template #header>
-            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
-          </template>
-          <template #default="scope">
-            <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
-            <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </detail-block>
-  </app-container>
-  <manage-box :apply-show="applyShow" @applyListSubmit="applyListSubmit" @handleClose="handleClose" />
-</template>
-
-<style lang="scss" scoped>
-.top-info {
-  width: 100%;
-  height: 50px;
-  padding-right: 10px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .title {
-    width: 75%;
-    text-align: center;
-  }
-}
-
-.info-content {
-  margin-top: 10px;
-  padding: 30px;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .content-top {
-    display: flex;
-    justify-content: space-around;
-  }
-
-  .info-dizhi {
-    margin-right: 155px;
-  }
-}
-
-.el-select {
-  width: 9vw;
-  margin-right: 15px;
-}
-
-.info-dizhi .el-input {
-  width: 20vw;
-}
-
-.input-width .el-input {
-  width: 30vw;
-}
-
-.info-appendix span {
-  margin-right: 25px;
-}
-
-.table-top {
-  margin-top: 10px;
-  padding: 5px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-radius: 10px;
-  background-color: #fff;
-
-  .table-top-title {
-    width: 60vw;
-    text-align: center;
-  }
-}
-
-.dialog-button {
-  margin-left: 50%;
-  transform: translateX(-50%);
-}
-</style>
diff --git a/src/views/measure/source/components/manageBox.vue b/src/views/measure/source/components/manageBox.vue
deleted file mode 100644
index c5ced8f..0000000
--- a/src/views/measure/source/components/manageBox.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script lang="ts" setup name="Manage-Box">
-import { ref } from 'vue'
-import type { Ref } from 'vue'
-const props = defineProps({
-  applyShow: {
-    type: Boolean,
-    default: false,
-  },
-})
-const emit = defineEmits(['applyListSubmit', 'handleClose']) // 关闭
-interface IapplyList {
-  select: string
-  epilog: string
-  approval: string
-  approvalTime: string
-}
-const applyList: Ref<IapplyList> = ref({})
-const handleClose = () => {
-  emit('handleClose')
-}
-const applyListSubmit = () => {
-  emit('applyListSubmit', applyList.value)
-}
-</script>
-
-<template>
-  <el-dialog
-    v-model="props.applyShow"
-    title="审批操作"
-    width="50%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="applyList"
-    >
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批意见:">
-            <el-radio-group v-model="applyList.select" class="ml-4">
-              <el-radio label="1" size="large">
-                同意
-              </el-radio>
-              <el-radio label="2" size="large">
-                驳回
-              </el-radio>
-              <el-radio label="3" size="large">
-                拒绝
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="24">
-          <el-form-item label="审批结论:">
-            <el-input
-              v-model="applyList.epilog"
-              :rows="4"
-              show-word-limit
-              type="textarea"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="审批人:">
-            <el-input
-              v-model="applyList.approval"
-              placeholder="审批人"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="审批时间:">
-            <el-input
-              v-model="applyList.approvalTime"
-              style="width: 100%;"
-              placeholder="审批时间"
-              disabled
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <template #footer>
-      <el-button type="primary" @click="applyListSubmit">
-        提交
-      </el-button>
-      <el-button type="info" @click="handleClose">
-        取消
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
diff --git a/src/views/measure/source/components/notPass.vue b/src/views/measure/source/components/notPass.vue
deleted file mode 100644
index 5a4b817..0000000
--- a/src/views/measure/source/components/notPass.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 未通过 -->
-<script lang="ts" setup name="notPass">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="未通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
deleted file mode 100644
index 31cd21c..0000000
--- a/src/views/measure/source/components/passed.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- 通过 -->
-<script lang="ts" setup name="passed">
-import { ref } from 'vue'
-import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
-</script>
-
-<template>
-  <list-page name="已通过" :buttoms="buttoms" />
-</template>
diff --git a/src/views/measure/source/components/sourceApprovalDetail.vue b/src/views/measure/source/components/sourceApprovalDetail.vue
new file mode 100644
index 0000000..28cd56c
--- /dev/null
+++ b/src/views/measure/source/components/sourceApprovalDetail.vue
@@ -0,0 +1,621 @@
+<script lang="ts" setup name="SourceApprovalDetail">
+// 溯源供方审批详情
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IButton, ISupplier, traceSupplierPerson } from '../list_interface'
+import ManageBox from './manageBox.vue'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListDetail, getSoucreListlevelType } from '@/api/measure/source'
+import { submitApproval } from '@/api/approval'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const buttonArray = ref<IButton[]>([])
+const pageType = ref('detail') // 页面类型: detail
+const buttonLoading = ref(false) // 按钮加载状态
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  2: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+  ],
+  3: [
+    { name: '取消', type: 'primary' },
+  ],
+}
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  const status = $route.params.type
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 溯源供方详情表单
+const dataForm = ref<ISupplier>({
+  id: '',
+  businessContent: '',
+  supplierName: '',
+  supplierNo: '',
+  bankAccount: '',
+  bankAccountNumber: '',
+  bankName: '',
+  briefName: '',
+  businessScope: '',
+  companyAddress: '',
+  companyArea: '',
+  companyCity: '',
+  companyCountry: '',
+  companyProvince: '',
+  createTime: '',
+  director: '',
+  fax: '',
+  invoiceAddress: '',
+  invoiceArea: '',
+  invoiceCity: '',
+  invoiceCountry: '',
+  invoiceProvince: '',
+  mailbox: '',
+  minioFileName: '',
+  mobile: '',
+  phone: '',
+  postalCode: '',
+  remark: '',
+  taxNumber: '',
+  website: '',
+  traceSupplierPersonList: [],
+})
+// 获取表单详情
+const getInfo = () => {
+  getSoucreListDetail({ id: infoId.value }).then((res) => {
+    dataForm.value = res.data
+    if (dataForm.value.approvalStatus) {
+      // 待审批
+      if (dataForm.value.approvalStatus == '2') {
+        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+      }
+      else if (dataForm.value.approvalStatus == '3') { // 审批中
+        // todo：判断当前用户是否为发起人
+        buttonArray.value = buttonsSet[dataForm.value.approvalStatus]
+      }
+    }
+  })
+}
+getInfo()
+
+const ruleFormRef = ref<FormInstance>()
+const traceSupplierPersonList: Ref<traceSupplierPerson[]> = ref([])
+const columns = [
+  { text: '人员编号', value: 'personNo' },
+  { text: '姓名', value: 'name' },
+  { text: '工作部门', value: 'department' },
+  { text: '职务', value: 'job' },
+  { text: '联系方式', value: 'phone' },
+]
+
+const provinceList = ref([])
+const fileList = ref<UploadUserFile[]>([])
+const cityList = ref([])
+const areaList = ref([])
+const invoiceProvince = ref([])
+const invoiceCityList = ref([])
+const areaInvoiceList = ref([])
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+
+// 获取公司地址省级
+const getCompanyAddress = (type: string) => {
+  getSoucreListlevelType(type).then((res) => {
+    provinceList.value = res.data
+  })
+}
+// 公司地址省级的值发生改变
+const changeProvince = (e: any) => {
+  cityList.value = []
+  areaList.value = []
+  dataForm.value.companyCity = ''
+  dataForm.value.companyArea = ''
+
+  getSoucreListlevelType(e).then((res) => {
+    cityList.value = res.data
+  })
+}
+// 公司地址市级发生改变
+const cityChange = (e: any) => {
+  areaList.value = []
+  dataForm.value.companyArea = ''
+  getSoucreListlevelType(e).then((res) => {
+    areaList.value = res.data
+  })
+}
+// 获取到开票地址省级
+const getinvoiceProvinceList = (type: string) => {
+  getSoucreListlevelType(type).then((res) => {
+    invoiceProvince.value = res.data
+  })
+}
+// 开票地址省级发生改变
+const changeInvoice = (e: any) => {
+  dataForm.value.invoiceCity = ''
+  dataForm.value.invoiceArea = ''
+  getSoucreListlevelType(e).then((res) => {
+    invoiceCityList.value = res.data
+  })
+}
+// 开票地址市级发生改变
+const invoiceCityChange = (e: string) => {
+  dataForm.value.invoiceArea = ''
+  getSoucreListlevelType(e).then((res) => {
+    areaInvoiceList.value = res.data
+  })
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  getInfo()
+}
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: dataForm.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+      })
+    })
+}
+const approvalDialog = ref()
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="溯源供方审批">
+      <template #btns>
+        <el-button v-for="(item, index) in buttonArray" :key="index" type="primary" @click="getAddList(ruleFormRef, item)">
+          {{ item }}
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="dataForm"
+        class="demo-form-inline"
+        label-width="auto"
+        label-position="right"
+        :rules="rules"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="溯源供方编号:" prop="supplierNo">
+              <el-input
+                v-model="dataForm.supplierNo"
+                :placeholder="
+                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
+                "
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="税号:" prop="taxNumber">
+              <el-input
+                v-model="dataForm.taxNumber"
+                :placeholder="pageType === 'detail' ? '无' : '请输入税号'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="邮编:">
+              <el-input
+                v-model="dataForm.postalCode"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮编'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="手机:">
+              <el-input
+                v-model="dataForm.mobile"
+                :placeholder="pageType === 'detail' ? '无' : '请输入手机'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="公司名称:" prop="supplierName">
+              <el-input
+                v-model="dataForm.supplierName"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="dataForm.bankAccount"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账户名'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="负责人:">
+              <el-input
+                v-model="dataForm.director"
+                :placeholder="pageType === 'detail' ? '无' : '请输入负责人'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="邮箱:">
+              <el-input
+                v-model="dataForm.mailbox"
+                :placeholder="pageType === 'detail' ? '无' : '请输入邮箱'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="公司简称:">
+              <el-input
+                v-model="dataForm.briefName"
+                :placeholder="pageType === 'detail' ? '无' : '请输入公司简称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="银行名称:">
+              <el-input
+                v-model="dataForm.bankName"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行名称'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电话:">
+              <el-input
+                v-model="dataForm.phone"
+                :placeholder="pageType === 'detail' ? '无' : '请输入电话'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="网址:">
+              <el-input
+                v-model="dataForm.website"
+                :placeholder="pageType === 'detail' ? '无' : '请输入网址'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="业务内容:" prop="businessContent">
+              <el-input
+                v-model="dataForm.businessContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入业务内容'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="dataForm.bankAccountNumber"
+                :placeholder="pageType === 'detail' ? '无' : '请输入银行账号'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传真:">
+              <el-input
+                v-model="dataForm.fax"
+                :placeholder="pageType === 'detail' ? '无' : '请输入传真'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-form-item label="公司地址:">
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyCountry" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyProvince" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyCity" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="4">
+              <el-input v-model="dataForm.companyArea" :disabled="pageType === 'detail'" />
+            </el-col>
+            <el-col :span="8">
+              <el-input
+                v-model="dataForm.companyAddress"
+                placeholder="公司详细地址"
+                :disabled="pageType === 'detail'"
+              />
+            </el-col>
+          </el-form-item>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-form-item label="开票地址:">
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceCountry"
+                placeholder="国别"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option label="中国" value="中国" />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceProvince"
+                placeholder="省"
+                :disabled="pageType === 'detail'"
+                @click="getinvoiceProvinceList('0')"
+                @change="changeInvoice"
+              >
+                <el-option
+                  v-for="province in invoiceProvince"
+                  :key="province.id"
+                  :label="province.areaName"
+                  :value="province.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceCity"
+                placeholder="市"
+                :disabled="pageType === 'detail'"
+                @change="invoiceCityChange"
+              >
+                <el-option
+                  v-for="city in invoiceCityList"
+                  :key="city.id"
+                  :label="city.areaName"
+                  :value="city.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="4">
+              <el-select
+                v-model="dataForm.invoiceArea"
+                placeholder="区/县"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="area in areaInvoiceList"
+                  :key="area.id"
+                  :label="area.areaName"
+                  :value="area.id"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="8">
+              <el-input
+                v-model="dataForm.invoiceAddress"
+                placeholder="开票详细地址"
+                :disabled="pageType === 'detail'"
+              />
+            </el-col>
+          </el-form-item>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="公司业务范围:">
+              <el-input
+                v-model="dataForm.businessScope"
+                :placeholder="
+                  pageType === 'detail' ? '无' : '请输入公司业务范围'
+                "
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="备注:">
+              <el-input
+                v-model="dataForm.remark"
+                :placeholder="pageType === 'detail' ? '无' : '请输入备注'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="14">
+            <el-form-item label="附件:">
+              <show-photo v-if="dataForm.minioFileName" :minio-file-name="dataForm.minioFileName" />
+              <span>无</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+    <detail-block title="审批流程">
+      <!-- 审批流程 -->
+      <div>
+        <el-timeline>
+          <el-timeline-item
+            v-for="(activity, index) in approvalActivities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
+    </detail-block>
+    <detail-block title="人员信息">
+      <el-table
+        :data="traceSupplierPersonList"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column align="center" label="序号" width="80" type="index" />
+        <el-table-column
+          v-for="item in columns"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #default="scope">
+            <span>{{ scope.row[item.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  margin-top: 10px;
+  padding: 30px;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .content-top {
+    display: flex;
+    justify-content: space-around;
+  }
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.el-select {
+  width: 9vw;
+  margin-right: 15px;
+}
+
+.info-dizhi .el-input {
+  width: 20vw;
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.info-appendix span {
+  margin-right: 25px;
+}
+
+.table-top {
+  margin-top: 10px;
+  padding: 5px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .table-top-title {
+    width: 60vw;
+    text-align: center;
+  }
+}
+
+.dialog-button {
+  margin-left: 50%;
+  transform: translateX(-50%);
+}
+</style>
diff --git a/src/views/measure/source/list.vue b/src/views/measure/source/list.vue
index fe9cf57..c7bd2f1 100644
--- a/src/views/measure/source/list.vue
+++ b/src/views/measure/source/list.vue
@@ -3,7 +3,8 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from './list_interface'
-import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreList, getSoucreListDelete } from '@/api/measure/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
 // 查询条件
@@ -22,7 +23,7 @@
 // 总数
 const total = ref(0)
 // 表头
-const columns = ref([
+const columns = ref<TableColumn[]>([
   {
     text: '溯源供方编号',
     value: 'supplierNo',
@@ -64,7 +65,7 @@
     text: '创建时间',
     value: 'createTime',
     align: 'center',
-    width: '200',
+    width: '180',
   },
   {
     text: '备注',
@@ -74,7 +75,7 @@
 ])
 
 // 选中的内容
-const checkoutList = ref([])
+const checkoutList = ref<string[]>([])
 // 文件上传input
 const fileRef = ref()
 // 删除id
@@ -99,7 +100,7 @@
 fetchData(true)
 // 多选发生改变时
 const handleSelectionChange = (e: any) => {
-  checkoutList.value = e
+  checkoutList.value = e.map((item: { id: string }) => item.id)
 }
 // 点击编辑id和删除row类型
 interface rowReturn {
@@ -159,20 +160,20 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else if (checkoutList.value.length > 0) {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
-      name: '溯源供方',
-      titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
-      sheetName: 'sheet1',
-    })
+  //   exportExcel({
+  //     json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+  //     name: '溯源供方',
+  //     titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+  //     sheetName: 'sheet1',
+  //   })
+  // }
+  // else if (checkoutList.value.length > 0) {
+  //   exportExcel({
+  //     json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, supplierNo: item.supplierNo, supplierName: item.supplierName, businessContent: item.businessContent, briefName: item.briefName, director: item.director, mobile: item.mobile, companyCity: item.companyCity, createTime: item.createTime, remark: item.remark })),
+  //     name: '溯源供方',
+  //     titleArr: ['序号', '溯源供方编号', '溯源供方名称', '业务内容', '业务资质', '负责人', '联系方式', '地址', '创建时间', '备注'],
+  //     sheetName: 'sheet1',
+  //   })
   }
   else {
     ElMessage.warning('暂无数据')
@@ -276,7 +277,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="250">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/measureSource/edit')"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index c8ba746..cb8bbe3 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -5,12 +5,13 @@
 import type { Ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadInstance, UploadProps, UploadUserFile } from 'element-plus'
-import type { IOptions, IformInline, traceSupplierPerson } from './list_interface'
+import type { IOptions, ISupplier, traceSupplierPerson } from './list_interface'
 import { exportFile } from '@/utils/exportUtils'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { UploadFile } from '@/api/measure/file'
-import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+import { getSoucreLisListExport, getSoucreListDetail, getSoucreListlevelType, sourceSave, sourceSubmit } from '@/api/measure/source'
 import { validatePhone } from '@/utils/validate'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
 const pageType = ref('add') // 页面类型: add,edit, detail
@@ -28,7 +29,7 @@
     infoId.value = $route.params.id as string
   }
 }
-const formInline: Ref<IformInline> = ref({
+const formInline: Ref<ISupplier> = ref({
   id: '',
   businessContent: '',
   supplierName: '',
@@ -43,7 +44,6 @@
   companyCity: '',
   companyCountry: '',
   companyProvince: '',
-  createTime: '',
   director: '',
   fax: '',
   invoiceAddress: '',
@@ -91,7 +91,6 @@
 const SelectionList: Ref<traceSupplierPerson[]> = ref([])
 // 校验规则
 const rules = ref({
-  supplierNo: [{ required: true, message: '溯源供方编号不能为空', trigger: 'blur' }],
   supplierName: [{ required: true, message: '公司名称不能为空', trigger: 'blur' }],
   businessContent: [{ required: true, message: '业务内容不能为空', trigger: 'blur' }],
   taxNumber: [{ required: true, message: '税号不能为空', trigger: 'blur' }],
@@ -203,48 +202,59 @@
   })
 }
 // 点击提交/导出按钮
-const getAddList = async (formEl: FormInstance | undefined, type: string) => {
+function exportForm() {
+  const params = {
+    businessContent: formInline.value.businessContent,
+    supplierName: formInline.value.supplierName,
+    supplierNo: formInline.value.supplierNo,
+  }
+  getSoucreLisListExport(params).then((res) => {
+    exportFile(res.data, '溯源供方详情')
+  })
+}
+
+// 保存至草稿箱
+function saveForm(formEl: FormInstance | undefined) {
   if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
+  formEl.validate((valid, fields) => {
     if (valid) {
       ElMessageBox.confirm(
-    `确认${type}吗？`,
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
       ).then(() => {
-        if (type === '提交' && pageType.value !== 'edit') {
-          getSoucreListAdd(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        }
-        else if (type === '提交' && pageType.value === 'edit') {
-          formInline.value.id = infoId.value
-          getSoucreLisUpdate(formInline.value).then((res) => {
-            if (res.code === 200) {
-              close()
-            }
-          })
-        }
-        else {
-          const params = {
-            businessContent: formInline.value.businessContent,
-            supplierName: formInline.value.supplierName,
-            supplierNo: formInline.value.supplierNo,
+        sourceSave(formInline.value).then((res) => {
+          if (res.code === 200) {
+            formInline.value.id = res.data.id
+            formInline.value.supplierNo = res.data.supplierNo
+            ElMessage.success('已保存')
           }
-          getSoucreLisListExport(params).then((res) => {
-            exportFile(res.data, '溯源供方详情')
-          })
-        }
+        })
       })
     }
   })
 }
+
+// 提交表单
+function submitForm() {
+  if (formInline.value.id) {
+    const params = {
+      id: formInline.value.id,
+      formId: SCHEDULE.SUPPLIER_APPROVAL, // 表单id
+    }
+    sourceSubmit(params).then((res) => {
+      ElMessage.success('提交成功')
+      close()
+    })
+  }
+  else {
+    ElMessage.info('请先保存再提交！')
+  }
+}
 const isShow = ref(false)
 const testForm = ref({
   fileList: [],
@@ -293,13 +303,14 @@
   <app-container>
     <detail-page :title="`溯源供方-${textMap[pageType]}`">
       <template #btns>
-        <el-button
-          type="primary"
-          @click="
-            getAddList(ruleFormRef, pageType === 'detail' ? '导出' : '提交')
-          "
-        >
-          {{ pageType === 'detail' ? '导出' : '提交' }}
+        <el-button type="primary" @click="exportForm">
+          导出
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="submitForm">
+          提交
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
         </el-button>
         <el-button type="info" @click="close">
           关闭
@@ -319,9 +330,9 @@
               <el-input
                 v-model="formInline.supplierNo"
                 :placeholder="
-                  pageType === 'detail' ? '无' : '请输入溯源供方编号'
+                  pageType === 'detail' ? '无' : '系统自动生成'
                 "
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
diff --git a/src/views/measure/source/list_interface.ts b/src/views/measure/source/list_interface.ts
index 5dd7a20..54f4732 100644
--- a/src/views/measure/source/list_interface.ts
+++ b/src/views/measure/source/list_interface.ts
@@ -24,6 +24,17 @@
   areaName: string
 }
 
+export interface supplierExportQuery {
+  businessContent: string // 业务内容
+  supplierName: string // 公司名称
+  supplierNo: string // 溯源供方编号
+  ids?: string[] //
+  approvalStatus?: string // 	审批状态类型code
+  companyArea?: string // 公司地址-区
+  companyCity?: string // 公司地址-市
+  companyProvince?: string // 公司地址-省
+  formId?: string // formId
+}
 // 溯源供方人员
 export interface traceSupplierPerson {
   id: number | string // id
@@ -36,38 +47,42 @@
   [key: string]: any
 }
 
-export interface IformInline {
-  businessContent: string
-  supplierName: string
-  supplierNo: string
-  bankAccount: string
-  bankAccountNumber: string
-  bankName: string
-  briefName: string
-  businessScope: string
-  companyAddress: string
-  companyArea: string
-  companyCity: string
-  companyCountry: string
-  companyProvince: string
-  createTime: string
-  director: string
-  id: string
-  fax: string
-  invoiceAddress: string
-  invoiceArea: string
-  invoiceCity: string
-  invoiceCountry: string
-  invoiceProvince: string
-  mailbox: string
-  minioFileName: string
-  mobile: string
-  phone: string
-  postalCode: string
-  remark: string
-  taxNumber: string
-  website: string
-  traceSupplierPersonList: traceSupplierPerson []
+export interface ISupplier {
+  businessContent: string // 业务内容
+  supplierName: string // 公司名称
+  supplierNo: string //	溯源供方编号（列表、更新接口参数）
+  bankAccount: string // 银行账户名
+  bankAccountNumber: string // 银行账号
+  bankName: string // 银行名称
+  briefName: string // 公司简称
+  businessScope: string // 公司业务范围
+  companyAddressBref?: string // 公司地址-拼接省市
+  companyAddress: string // 公司地址-详细地址
+  companyArea: string // 公司地址-区
+  companyCity: string //	公司地址-市
+  companyCountry: string // 公司地址-国家
+  companyProvince: string // 公司地址-省
+  createTime?: string // 创建时间
+  director: string // 负责人
+  id: string // 主键id（列表、更新接口参数）
+  fax: string // 传真
+  invoiceAddress: string // 开票地址-详细地址
+  invoiceArea: string // 开票地址-区
+  invoiceCity: string //	开票地址-市
+  invoiceCountry: string // 开票地址-国家
+  invoiceProvince: string // 开票地址-省
+  mailbox: string // 邮箱
+  minioFileName: string // 上传文件返回名称
+  mobile: string // 手机
+  phone: string // 电话
+  postalCode: string //	邮编
+  remark: string // 备注
+  taxNumber: string // 税号
+  website: string //	网址
+  traceSupplierPersonList: traceSupplierPerson [] | '' // 溯源供方人员列表
+  taskId?: '' // 任务id, 流程审批用
+  approvalStatus?: string // 审批状态
+  approvalStatusName?: string // 审批状态名称
 }
 
 export interface IlistTypes {
@@ -83,3 +98,8 @@
   limit: number
 }
 
+export interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+}