diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+<!-- 未通过 -->
+<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/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+<!-- 未通过 -->
+<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/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+<!-- 通过 -->
+<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/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+<!-- 未通过 -->
+<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/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+<!-- 通过 -->
+<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/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '主管部门',
@@ -90,12 +90,12 @@
   {
     text: '创建时间',
     value: 'createTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
+    width: '100',
   },
 ])
 // 搜索
@@ -305,7 +305,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="220">
+            <el-table-column label="操作" align="center" width="255">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+<!-- 未通过 -->
+<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/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+<!-- 通过 -->
+<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/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '主管部门',
@@ -90,12 +90,12 @@
   {
     text: '创建时间',
     value: 'createTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
+    width: '100',
   },
 ])
 // 搜索
@@ -305,7 +305,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="220">
+            <el-table-column label="操作" align="center" width="255">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 8c73928..214db19 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -165,12 +165,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+<!-- 未通过 -->
+<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/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+<!-- 通过 -->
+<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/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '主管部门',
@@ -90,12 +90,12 @@
   {
     text: '创建时间',
     value: 'createTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
+    width: '100',
   },
 ])
 // 搜索
@@ -305,7 +305,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="220">
+            <el-table-column label="操作" align="center" width="255">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 8c73928..214db19 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -165,12 +165,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index e9e46f2..1a0b003 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -42,7 +42,7 @@
   {
     text: '记录编号',
     value: 'logNo',
-    width: '160',
+    width: '180',
   },
   {
     text: '培训名称',
@@ -52,7 +52,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训地点',
@@ -62,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
+    width: '100',
   },
   {
     text: '培训时间',
     value: 'trainPerson',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
+    width: '100',
   },
   {
     text: '创建时间',
@@ -260,7 +260,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+<!-- 未通过 -->
+<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/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+<!-- 通过 -->
+<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/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '主管部门',
@@ -90,12 +90,12 @@
   {
     text: '创建时间',
     value: 'createTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
+    width: '100',
   },
 ])
 // 搜索
@@ -305,7 +305,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="220">
+            <el-table-column label="操作" align="center" width="255">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 8c73928..214db19 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -165,12 +165,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index e9e46f2..1a0b003 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -42,7 +42,7 @@
   {
     text: '记录编号',
     value: 'logNo',
-    width: '160',
+    width: '180',
   },
   {
     text: '培训名称',
@@ -52,7 +52,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训地点',
@@ -62,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
+    width: '100',
   },
   {
     text: '培训时间',
     value: 'trainPerson',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
+    width: '100',
   },
   {
     text: '创建时间',
@@ -260,7 +260,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index bb9d6a9..20bd24d 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -180,12 +180,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+<!-- 未通过 -->
+<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/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+<!-- 通过 -->
+<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/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '主管部门',
@@ -90,12 +90,12 @@
   {
     text: '创建时间',
     value: 'createTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
+    width: '100',
   },
 ])
 // 搜索
@@ -305,7 +305,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="220">
+            <el-table-column label="操作" align="center" width="255">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 8c73928..214db19 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -165,12 +165,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index e9e46f2..1a0b003 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -42,7 +42,7 @@
   {
     text: '记录编号',
     value: 'logNo',
-    width: '160',
+    width: '180',
   },
   {
     text: '培训名称',
@@ -52,7 +52,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训地点',
@@ -62,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
+    width: '100',
   },
   {
     text: '培训时间',
     value: 'trainPerson',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
+    width: '100',
   },
   {
     text: '创建时间',
@@ -260,7 +260,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index bb9d6a9..20bd24d 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -180,12 +180,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 3c8f0f4..abc147d 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -1,3 +1,55 @@
+<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 {
+  name: string
+  comp: 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 current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>培训计划审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+<!-- 未通过 -->
+<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/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+<!-- 通过 -->
+<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/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '主管部门',
@@ -90,12 +90,12 @@
   {
     text: '创建时间',
     value: 'createTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
+    width: '100',
   },
 ])
 // 搜索
@@ -305,7 +305,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="220">
+            <el-table-column label="操作" align="center" width="255">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 8c73928..214db19 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -165,12 +165,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index e9e46f2..1a0b003 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -42,7 +42,7 @@
   {
     text: '记录编号',
     value: 'logNo',
-    width: '160',
+    width: '180',
   },
   {
     text: '培训名称',
@@ -52,7 +52,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训地点',
@@ -62,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
+    width: '100',
   },
   {
     text: '培训时间',
     value: 'trainPerson',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
+    width: '100',
   },
   {
     text: '创建时间',
@@ -260,7 +260,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index bb9d6a9..20bd24d 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -180,12 +180,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 3c8f0f4..abc147d 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -1,3 +1,55 @@
+<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 {
+  name: string
+  comp: 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 current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>培训计划审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 1376467..9910a0d 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -135,7 +135,7 @@
         关 闭
       </el-button>
     </div> -->
-
+    <el-button>保存</el-button>
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+<!-- 未通过 -->
+<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/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+<!-- 通过 -->
+<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/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '主管部门',
@@ -90,12 +90,12 @@
   {
     text: '创建时间',
     value: 'createTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
+    width: '100',
   },
 ])
 // 搜索
@@ -305,7 +305,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="220">
+            <el-table-column label="操作" align="center" width="255">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 8c73928..214db19 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -165,12 +165,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index e9e46f2..1a0b003 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -42,7 +42,7 @@
   {
     text: '记录编号',
     value: 'logNo',
-    width: '160',
+    width: '180',
   },
   {
     text: '培训名称',
@@ -52,7 +52,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训地点',
@@ -62,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
+    width: '100',
   },
   {
     text: '培训时间',
     value: 'trainPerson',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
+    width: '100',
   },
   {
     text: '创建时间',
@@ -260,7 +260,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index bb9d6a9..20bd24d 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -180,12 +180,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 3c8f0f4..abc147d 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -1,3 +1,55 @@
+<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 {
+  name: string
+  comp: 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 current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>培训计划审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 1376467..9910a0d 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -135,7 +135,7 @@
         关 闭
       </el-button>
     </div> -->
-
+    <el-button>保存</el-button>
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index d26e734..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -70,25 +70,25 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  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) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // 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) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
@@ -225,6 +225,14 @@
 const look = () => {
   console.log(ruleForm.noticeContent)
 }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -279,9 +287,11 @@
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+<!-- 未通过 -->
+<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/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+<!-- 通过 -->
+<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/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '主管部门',
@@ -90,12 +90,12 @@
   {
     text: '创建时间',
     value: 'createTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
+    width: '100',
   },
 ])
 // 搜索
@@ -305,7 +305,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="220">
+            <el-table-column label="操作" align="center" width="255">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 8c73928..214db19 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -165,12 +165,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index e9e46f2..1a0b003 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -42,7 +42,7 @@
   {
     text: '记录编号',
     value: 'logNo',
-    width: '160',
+    width: '180',
   },
   {
     text: '培训名称',
@@ -52,7 +52,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训地点',
@@ -62,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
+    width: '100',
   },
   {
     text: '培训时间',
     value: 'trainPerson',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
+    width: '100',
   },
   {
     text: '创建时间',
@@ -260,7 +260,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index bb9d6a9..20bd24d 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -180,12 +180,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 3c8f0f4..abc147d 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -1,3 +1,55 @@
+<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 {
+  name: string
+  comp: 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 current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>培训计划审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 1376467..9910a0d 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -135,7 +135,7 @@
         关 闭
       </el-button>
     </div> -->
-
+    <el-button>保存</el-button>
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index d26e734..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -70,25 +70,25 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  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) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // 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) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
@@ -225,6 +225,14 @@
 const look = () => {
   console.log(ruleForm.noticeContent)
 }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -279,9 +287,11 @@
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index ea89ddc..85898ea 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -1,11 +1,12 @@
 <script lang="ts" setup name="Process">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery } from './process'
 import EditProcess from './editProcess.vue'
 import DetailProcess from './detailProcess.vue'
 import { delLoginLog, getLoginLogList } from '@/api/system/log'
+import { exportExcel } from '@/utils/exportXlsx'
 
 const { proxy } = getCurrentInstance() as any
 const active = ref('main')
@@ -17,7 +18,7 @@
   time: '', // 创建时间
   status: '', // 当前流程状态,
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 const columns = ref([
   {
@@ -42,6 +43,10 @@
     value: 'person',
   },
   {
+    text: '创建时间',
+    value: 'createTime',
+  },
+  {
     text: '流程描述',
     value: 'describe',
   },
@@ -110,7 +115,12 @@
 
 // 重置
 const reset = () => {
-  console.log('点击重置')
+  listQuery.number = '' // 编号
+  listQuery.name = '' // 名称
+  listQuery.business = '' // 关联业务
+  listQuery.person = '' // 负责人
+  listQuery.time = '' // 创建时间
+  listQuery.status = '' // 当前流程状态,
 }
 // 编辑
 const edit = (row: IlistQuery) => {
@@ -134,6 +144,66 @@
 const close = () => {
   active.value = 'main'
 }
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // fetchData({ ...listQuery, limit: 9999999, offset: 1 }).then((res) => {
+  //   if (res.code === 200) {
+  //     exportExcel({
+  //       json: res.data.rows.map((item: IlistQuery, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+  //       name: '通知公告',
+  //       titleArr: ['序号', '流程编号', '流程名称', '关联业务', '当前流程状态', '流程负责人', '创建时间', '流程描述'],
+  //       sheetName: 'sheet1',
+  //     })
+  //   }
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+  exportExcel({
+    json: list.value.map((item: IlistQuery, index: number) => (
+      {
+        index: index + 1,
+        number: item.number,
+        name: item.name,
+        business: item.business,
+        status: item.status,
+        person: item.person,
+        time: item.time,
+        describe: item.describe,
+      }
+    )),
+    name: '流程管理',
+    titleArr: ['序号', '流程编号', '流程名称', '关联业务', '当前流程状态', '流程负责人', '创建时间', '流程描述'],
+    sheetName: 'sheet1',
+  })
+  loading.close()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '流程管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 </script>
 
 <template>
@@ -142,7 +212,7 @@
       <!-- 主页面 -->
       <div v-if="active === 'main'">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input
               v-model.trim="listQuery.number"
@@ -186,42 +256,55 @@
               placeholder="创建时间"
             />
           </search-item>
-          <template #btns>
-            <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-              重置
-            </el-button>
-          </template>
         </search-area>
         <!-- 查询结果Table显示 -->
-        <div class="table-area">
-          <normal-table
-            :data="list"
-            :total="total"
-            :columns="columns"
-            :query="listQuery"
-            :list-loading="listLoading"
-            @change="changePage"
-          >
-            <template #columns>
-              <el-table-column label="操作" width="200" align="center">
-                <template #default="scope">
-                  <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
-                    编辑
-                  </el-button>
-                  <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
-                    详情
-                  </el-button>
-                  <el-button type="primary" link size="small" class="table-text-button" @click="abolish(scope.row)">
-                    废止
-                  </el-button>
-                  <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
-                    删除
-                  </el-button>
-                </template>
-              </el-table-column>
-            </template>
-          </normal-table>
-        </div>
+        <table-container>
+          <template #btns-right>
+            <el-button type="primary" @click="exportExcelBtn">
+              导出
+            </el-button>
+            <el-button v-print="printObj" type="primary">
+              打印
+            </el-button>
+          </template>
+
+          <div class="table-area">
+            <normal-table
+              :data="list"
+              :total="total"
+              :columns="columns"
+              :query="listQuery"
+              :list-loading="listLoading"
+              @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="#" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+              <template #columns>
+                <el-table-column label="操作" width="200" align="center">
+                  <template #default="scope">
+                    <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                      编辑
+                    </el-button>
+                    <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
+                      详情
+                    </el-button>
+                    <el-button type="primary" link size="small" class="table-text-button" @click="abolish(scope.row)">
+                      废止
+                    </el-button>
+                    <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </div>
+        </table-container>
       </div>
       <!-- 编辑 -->
       <div v-if="active === 'edit'">

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+<!-- 未通过 -->
+<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/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+<!-- 通过 -->
+<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/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '主管部门',
@@ -90,12 +90,12 @@
   {
     text: '创建时间',
     value: 'createTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
+    width: '100',
   },
 ])
 // 搜索
@@ -305,7 +305,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="220">
+            <el-table-column label="操作" align="center" width="255">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 8c73928..214db19 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -165,12 +165,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index e9e46f2..1a0b003 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -42,7 +42,7 @@
   {
     text: '记录编号',
     value: 'logNo',
-    width: '160',
+    width: '180',
   },
   {
     text: '培训名称',
@@ -52,7 +52,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训地点',
@@ -62,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
+    width: '100',
   },
   {
     text: '培训时间',
     value: 'trainPerson',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
+    width: '100',
   },
   {
     text: '创建时间',
@@ -260,7 +260,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index bb9d6a9..20bd24d 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -180,12 +180,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 3c8f0f4..abc147d 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -1,3 +1,55 @@
+<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 {
+  name: string
+  comp: 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 current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>培训计划审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 1376467..9910a0d 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -135,7 +135,7 @@
         关 闭
       </el-button>
     </div> -->
-
+    <el-button>保存</el-button>
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index d26e734..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -70,25 +70,25 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  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) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // 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) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
@@ -225,6 +225,14 @@
 const look = () => {
   console.log(ruleForm.noticeContent)
 }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -279,9 +287,11 @@
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index ea89ddc..85898ea 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -1,11 +1,12 @@
 <script lang="ts" setup name="Process">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery } from './process'
 import EditProcess from './editProcess.vue'
 import DetailProcess from './detailProcess.vue'
 import { delLoginLog, getLoginLogList } from '@/api/system/log'
+import { exportExcel } from '@/utils/exportXlsx'
 
 const { proxy } = getCurrentInstance() as any
 const active = ref('main')
@@ -17,7 +18,7 @@
   time: '', // 创建时间
   status: '', // 当前流程状态,
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 const columns = ref([
   {
@@ -42,6 +43,10 @@
     value: 'person',
   },
   {
+    text: '创建时间',
+    value: 'createTime',
+  },
+  {
     text: '流程描述',
     value: 'describe',
   },
@@ -110,7 +115,12 @@
 
 // 重置
 const reset = () => {
-  console.log('点击重置')
+  listQuery.number = '' // 编号
+  listQuery.name = '' // 名称
+  listQuery.business = '' // 关联业务
+  listQuery.person = '' // 负责人
+  listQuery.time = '' // 创建时间
+  listQuery.status = '' // 当前流程状态,
 }
 // 编辑
 const edit = (row: IlistQuery) => {
@@ -134,6 +144,66 @@
 const close = () => {
   active.value = 'main'
 }
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // fetchData({ ...listQuery, limit: 9999999, offset: 1 }).then((res) => {
+  //   if (res.code === 200) {
+  //     exportExcel({
+  //       json: res.data.rows.map((item: IlistQuery, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+  //       name: '通知公告',
+  //       titleArr: ['序号', '流程编号', '流程名称', '关联业务', '当前流程状态', '流程负责人', '创建时间', '流程描述'],
+  //       sheetName: 'sheet1',
+  //     })
+  //   }
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+  exportExcel({
+    json: list.value.map((item: IlistQuery, index: number) => (
+      {
+        index: index + 1,
+        number: item.number,
+        name: item.name,
+        business: item.business,
+        status: item.status,
+        person: item.person,
+        time: item.time,
+        describe: item.describe,
+      }
+    )),
+    name: '流程管理',
+    titleArr: ['序号', '流程编号', '流程名称', '关联业务', '当前流程状态', '流程负责人', '创建时间', '流程描述'],
+    sheetName: 'sheet1',
+  })
+  loading.close()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '流程管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 </script>
 
 <template>
@@ -142,7 +212,7 @@
       <!-- 主页面 -->
       <div v-if="active === 'main'">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input
               v-model.trim="listQuery.number"
@@ -186,42 +256,55 @@
               placeholder="创建时间"
             />
           </search-item>
-          <template #btns>
-            <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-              重置
-            </el-button>
-          </template>
         </search-area>
         <!-- 查询结果Table显示 -->
-        <div class="table-area">
-          <normal-table
-            :data="list"
-            :total="total"
-            :columns="columns"
-            :query="listQuery"
-            :list-loading="listLoading"
-            @change="changePage"
-          >
-            <template #columns>
-              <el-table-column label="操作" width="200" align="center">
-                <template #default="scope">
-                  <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
-                    编辑
-                  </el-button>
-                  <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
-                    详情
-                  </el-button>
-                  <el-button type="primary" link size="small" class="table-text-button" @click="abolish(scope.row)">
-                    废止
-                  </el-button>
-                  <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
-                    删除
-                  </el-button>
-                </template>
-              </el-table-column>
-            </template>
-          </normal-table>
-        </div>
+        <table-container>
+          <template #btns-right>
+            <el-button type="primary" @click="exportExcelBtn">
+              导出
+            </el-button>
+            <el-button v-print="printObj" type="primary">
+              打印
+            </el-button>
+          </template>
+
+          <div class="table-area">
+            <normal-table
+              :data="list"
+              :total="total"
+              :columns="columns"
+              :query="listQuery"
+              :list-loading="listLoading"
+              @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="#" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+              <template #columns>
+                <el-table-column label="操作" width="200" align="center">
+                  <template #default="scope">
+                    <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                      编辑
+                    </el-button>
+                    <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
+                      详情
+                    </el-button>
+                    <el-button type="primary" link size="small" class="table-text-button" @click="abolish(scope.row)">
+                      废止
+                    </el-button>
+                    <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </div>
+        </table-container>
       </div>
       <!-- 编辑 -->
       <div v-if="active === 'edit'">
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index c0d0b58..330f2de 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -194,7 +194,7 @@
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">

diff --git a/public/data.json b/public/data.json
index 632c75c..46563c4 100644
--- a/public/data.json
+++ b/public/data.json
@@ -22,117 +22,7 @@
             "ccSelfSelectFlag": "",
             "conditionList": [],
             "nodeUserList": [],
-            "childNode": {
-                "nodeName": "审核人",
-                "error": false,
-                "type": 1,
-                "settype": 2,
-                "selectMode": 0,
-                "selectRange": 0,
-                "directorLevel": 1,
-                "examineMode": 1,
-                "noHanderAction": 2,
-                "examineEndDirectorLevel": 0,
-                "childNode": {
-                    "nodeName": "路由",
-                    "type": 4,
-                    "priorityLevel": 1,
-                    "settype": 1,
-                    "selectMode": 0,
-                    "selectRange": 0,
-                    "directorLevel": 1,
-                    "examineMode": 1,
-                    "noHanderAction": 2,
-                    "examineEndDirectorLevel": 1,
-                    "ccSelfSelectFlag": 1,
-                    "conditionList": [],
-                    "nodeUserList": [],
-                    "childNode": {
-                        "nodeName": "抄送人",
-                        "type": 2,
-                        "ccSelfSelectFlag": 1,
-                        "childNode": null,
-                        "nodeUserList": [],
-                        "error": false
-                    },
-                    "conditionNodes": [{
-                        "nodeName": "条件1",
-                        "type": 3,
-                        "priorityLevel": 1,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [{
-                            "columnId": 0,
-                            "type": 1,
-                            "conditionEn": "",
-                            "conditionCn": "",
-                            "optType": "",
-                            "zdy1": "",
-                            "zdy2": "",
-                            "opt1": "",
-                            "opt2": "",
-                            "columnDbname": "",
-                            "columnType": "",
-                            "showType": "",
-                            "showName": "",
-                            "fixedDownBoxValue": ""
-                        }],
-                        "nodeUserList": [{
-                            "targetId": 85,
-                            "type": 1,
-                            "name": "天旭"
-                        }],
-                        "childNode": {
-                            "nodeName": "审核人",
-                            "type": 1,
-                            "priorityLevel": 1,
-                            "settype": 1,
-                            "selectMode": 0,
-                            "selectRange": 0,
-                            "directorLevel": 1,
-                            "examineMode": 1,
-                            "noHanderAction": 2,
-                            "examineEndDirectorLevel": 1,
-                            "ccSelfSelectFlag": 1,
-                            "conditionList": [],
-                            "nodeUserList": [{
-                                "targetId": 2515744,
-                                "type": 1,
-                                "name": "哈哈哈哈"
-                            }],
-                            "childNode": null,
-                            "conditionNodes": [],
-                            "error": false
-                        },
-                        "conditionNodes": [],
-                        "error": false
-                    }, {
-                        "nodeName": "条件2",
-                        "type": 3,
-                        "priorityLevel": 2,
-                        "settype": 1,
-                        "selectMode": 0,
-                        "selectRange": 0,
-                        "directorLevel": 1,
-                        "examineMode": 1,
-                        "noHanderAction": 2,
-                        "examineEndDirectorLevel": 1,
-                        "ccSelfSelectFlag": 1,
-                        "conditionList": [],
-                        "nodeUserList": [],
-                        "childNode": null,
-                        "conditionNodes": [],
-                        "error": false
-                    }]
-                },
-                "nodeUserList": []
-            },
+
             "conditionNodes": []
         }
     }
diff --git a/src/api/measure/file.ts b/src/api/measure/file.ts
index 05235e3..3e3ccb0 100644
--- a/src/api/measure/file.ts
+++ b/src/api/measure/file.ts
@@ -43,14 +43,21 @@
   })
 }
 // 文件上传
-export function UploadFile(fileobj: any) {
-  const param = new FormData()
-  param.append('file', fileobj.file)
+// export function UploadFile(fileobj: any) {
+//   const param = new FormData()
+//   param.append('file', fileobj.file)
+//   return request({
+//     url: 'file/uploadFile',
+//     method: 'post',
+//     headers: { 'Content-Type': 'multipart/form-data' },
+//     data: param,
+//   })
+// }
+export function UploadFile(data: FormData) {
   return request({
-    url: 'file/uploadFile',
+    url: 'minio/file/upload',
     method: 'post',
-    headers: { 'Content-Type': 'multipart/form-data' },
-    data: param,
+    data,
   })
 }
 // 导出
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index 458c53e..09288a9 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -61,27 +61,26 @@
   },
   // 设置审批节点的文字
   setApproverStr(nodeConfig) {
-    console.log(nodeConfig)
     let tempValue = '会签'
     let strPeople = ' '
     if (nodeConfig.selectCustomApprovalType === 'huoqian') {
       tempValue = '或签'
     }
     if (nodeConfig.selectCustomApprovalMethod === 'normal') {
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
       }
       return strPeople
     }
     else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
       let strPeople = ' '
-      if (nodeConfig.nodeUserList.length === 1) {
+      if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length === 1) {
         strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
       }
-      else if (nodeConfig.nodeUserList.length > 1) {
+      else if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length > 1) {
         strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
       }
       return strPeople
@@ -180,9 +179,7 @@
   },
   // 设置抄送人节点文字
   copyerStr(nodeConfig) {
-    console.log('44444444')
-    console.log(nodeConfig.nodeUserList)
-    if (nodeConfig.nodeUserList.length != 0) {
+    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
       console.log(this.arrToStr(nodeConfig.nodeUserList))
       return this.arrToStr(nodeConfig.nodeUserList)
     }
diff --git a/src/views/measure/bench/bench.vue b/src/views/measure/bench/bench.vue
index c8465cc..cb6d856 100644
--- a/src/views/measure/bench/bench.vue
+++ b/src/views/measure/bench/bench.vue
@@ -5,6 +5,8 @@
 import { listPageApi } from '@/api/measure/file'
 import Echarts from '@/components/echarts/index.vue'
 import EchartsPie from '@/components/echarts/pie.vue'
+import useUserStore from '@/store/modules/user'
+const { username } = useUserStore()
 const buttomTypes = ref([
   { id: '1', text: '培训记录', url: '/train/trainLog' },
   { id: '2', text: '证书到期提醒', url: '/person/remind' },
@@ -63,7 +65,7 @@
     StaffSStatisticxAxis.value = await res.data.map(item => Number(item.count))
   })
   const param = {
-    account: localStorage.getItem('login_username'),
+    account: username,
   }
   getTrainLogSStatistic(param).then((res) => {
     TrainLogSList.value = [
diff --git a/src/views/measure/file/components/addDialog.vue b/src/views/measure/file/components/addDialog.vue
index 2b67e84..a1464aa 100644
--- a/src/views/measure/file/components/addDialog.vue
+++ b/src/views/measure/file/components/addDialog.vue
@@ -175,32 +175,30 @@
   emits('resetData')
 }
 
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
+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) {
+        console.log(res.data[0])
+        ruleForm.minioFileName = res.data[0]
+        // 重置当前验证
+        ruleFormRef.value?.clearValidate('minioFileName')
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
 }
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-  )
-}
-// 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
-    if (res.code === 200) {
-      ruleForm.minioFileName = res.data.fileName
-      // fileList.value.push({
-      //   name: ruleForm.minioFileName,
-      //   url: '',
-      // })
-      // 重置当前验证
-      ruleFormRef.value?.clearValidate('minioFileName')
-      ElMessage.success('文件上传成功')
-    }
-  })
+const upload = () => {
+  fileRef.value.click()
 }
 // 实施状态判断
 // const statusList = ref([
@@ -322,8 +320,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="附件" prop="minioFileName">
-              <show-photo v-if="title === '详情'" :minio-file-name="ruleForm.minioFileName" />
-              <el-upload
+              <show-photo :minio-file-name="ruleForm.minioFileName" />
+              <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
+              </el-button>
+              <!-- <el-upload
                 v-else
                 v-model:file-list="fileList"
                 enctype="multipart/form-data"
@@ -335,7 +337,7 @@
                 <el-button type="primary">
                   上传
                 </el-button>
-              </el-upload>
+              </el-upload> -->
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index 51b0dcd..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -67,7 +67,7 @@
       { text: '计量专业', value: 'meterMajor', align: 'center' },
       { text: '负责人', value: 'director', align: 'center' },
       { text: '联系方式', value: 'phone', align: 'center' },
-      { text: '所属科室', value: 'deptId', align: 'center' },
+      { text: '所属科室', value: 'pDeptName', align: 'center' },
       { text: '科室负责人', value: '', align: 'center' },
       { text: '创建日期', value: 'createTime', align: 'center' },
     ],
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index d8d1ff0..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -157,11 +157,13 @@
   ruleFormRef.value?.clearValidate('name')
 }
 // 上传请求
-const uploadQuarterlyEvaluateFile: any = (file: File) => {
-  UploadFile(file).then((res) => {
+const uploadQuarterlyEvaluateFile: any = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
     if (res.code === 200) {
       ruleFormRef.value?.clearValidate('minioFileName')
-      ruleForm.value.minioFileName = res.data.fileName
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
diff --git a/src/views/measure/price/priceAdd.vue b/src/views/measure/price/priceAdd.vue
index 2e0c9b4..eaea4a5 100644
--- a/src/views/measure/price/priceAdd.vue
+++ b/src/views/measure/price/priceAdd.vue
@@ -154,10 +154,10 @@
         基本信息
       </h4>
       <div>
-        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" plain @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
+        <el-button v-print="buttonType === '详情' ? printObj : ''" type="primary" @click="getAddList(buttonType === '详情' ? '打印' : '提交')">
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/source/components/all.vue b/src/views/measure/source/components/all.vue
index 7a5e9cd..d124307 100644
--- a/src/views/measure/source/components/all.vue
+++ b/src/views/measure/source/components/all.vue
@@ -1,8 +1,17 @@
 <!-- 全部 -->
 <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="全部" />
+  <list-page name="全部" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/approvalPending.vue b/src/views/measure/source/components/approvalPending.vue
index c3ebb16..8a7a8bc 100644
--- a/src/views/measure/source/components/approvalPending.vue
+++ b/src/views/measure/source/components/approvalPending.vue
@@ -1,8 +1,16 @@
 <!-- 待审批 -->
 <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="待审批" />
+  <list-page name="待审批" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/canceled.vue b/src/views/measure/source/components/canceled.vue
index 2ee9818..3b9657c 100644
--- a/src/views/measure/source/components/canceled.vue
+++ b/src/views/measure/source/components/canceled.vue
@@ -1,8 +1,15 @@
 <!-- 取消 -->
 <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="取消" />
+  <list-page name="已取消" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/draftBox.vue b/src/views/measure/source/components/draftBox.vue
index cac05fc..43d7b75 100644
--- a/src/views/measure/source/components/draftBox.vue
+++ b/src/views/measure/source/components/draftBox.vue
@@ -1,8 +1,15 @@
 <!-- 草稿箱 -->
 <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="草稿箱" />
+  <list-page name="草稿箱" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/examineAndApprove.vue b/src/views/measure/source/components/examineAndApprove.vue
index ec6232b..c13f95a 100644
--- a/src/views/measure/source/components/examineAndApprove.vue
+++ b/src/views/measure/source/components/examineAndApprove.vue
@@ -1,8 +1,17 @@
 <!-- 审批中 -->
 <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="审批中" />
+  <list-page name="审批中" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/listPage.vue b/src/views/measure/source/components/listPage.vue
index e89a838..a9c9509 100644
--- a/src/views/measure/source/components/listPage.vue
+++ b/src/views/measure/source/components/listPage.vue
@@ -3,7 +3,7 @@
 import type { Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import type { IlistQuery, IlistType } from '../list_interface'
-import ListSourceAdd from '../listAdd.vue'
+import ListSourceAdd from './listPageAdd.vue'
 import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
 import { uploadApi } from '@/api/system/notice'
 import { exportExcel } from '@/utils/exportXlsx'
@@ -12,6 +12,10 @@
     type: String,
     default: '全部',
   },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
 })
 // 查询条件
 const listQuery: Ref<IlistQuery> = ref({
@@ -70,6 +74,7 @@
   },
 ])
 
+const buttonArray = ref([])
 // 选中的内容
 const checkoutList = ref([])
 // 文件上传input
@@ -100,6 +105,7 @@
 }
 // 点击编辑/详情
 const handleEdit = (index: string, row: object, value: string) => {
+  buttonArray.value = ['同意', '驳回', '拒绝']
   buttonType.value = value
   infoId.value = row.id
   show.value = false
@@ -279,6 +285,9 @@
       </search-area>
       <table-container>
         <template #btns-right>
+          <el-button type="primary" @click="add">
+            新建
+          </el-button>
           <el-button type="primary" @click="exportAll">
             导出
           </el-button>
@@ -292,31 +301,16 @@
           :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="300">
               <template #default="{ row }">
                 <el-button
+                  v-for="item in buttoms"
+                  :key="item"
                   size="small"
-                  type="primary"
-                  link
-                  @click="handleEdit(row.$index, row, '编辑')"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
                 >
-                  编辑
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="primary"
-                  @click="handleEdit(row.$index, row, '详情')"
-                >
-                  详情
-                </el-button>
-                <el-button
-                  size="small"
-                  link
-                  type="danger"
-                  @click="handleDelete(row.$index, row)"
-                >
-                  删除
+                  {{ item.name }}
                 </el-button>
               </template>
             </el-table-column>
@@ -330,6 +324,7 @@
     v-else
     :info-id="infoId"
     :button-type="buttonType"
+    :button-array="buttonArray"
     @close="close"
   />
 </template>
diff --git a/src/views/measure/source/components/listPageAdd.vue b/src/views/measure/source/components/listPageAdd.vue
new file mode 100644
index 0000000..d20c2cd
--- /dev/null
+++ b/src/views/measure/source/components/listPageAdd.vue
@@ -0,0 +1,548 @@
+<script lang="ts" setup name="ListSourceAdd">
+import { reactive, ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { UploadInstance, UploadProps, UploadRawFile, UploadUserFile } from 'element-plus'
+import type { IformInline } from './list_interface'
+import { exportFile } from '@/utils/exportUtils'
+import { UploadFile } from '@/api/measure/file'
+import { getSoucreLisListExport, getSoucreLisUpdate, getSoucreListAdd, getSoucreListDetail, getSoucreListlevelType } from '@/api/system/source'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+  buttonArray: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['close'])
+const formInline: Ref<IformInline> = 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 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([])
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  personNo: '',
+  name: '',
+  department: '',
+  job: '',
+  phone: '',
+})
+const SelectionList = ref([])
+const upload = ref<UploadInstance>()
+const close = () => {
+  emit('close')
+}
+const getInfo = () => {
+  getSoucreListDetail({ id: props.infoId }).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 addRoow = () => {
+  Object.keys(addPersonList.value).forEach(key => (addPersonList.value[key] = ''))
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.traceSupplierPersonList.push(JSON.parse(JSON.stringify(addPersonList.value)))
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.traceSupplierPersonList = formInline.value.traceSupplierPersonList.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+// 点击提交/导出按钮
+const getAddList = (type: string) => {
+  if (formInline.value.supplierNo === null) {
+    return ElMessage.error('请填写溯源供方编号')
+  }
+  else if (formInline.value.supplierName === null) {
+    return ElMessage.error('请填写公司名称')
+  }
+  else if (formInline.value.businessContent === null) {
+    return ElMessage.error('请填写业务内容')
+  }
+  else if (formInline.value.taxNumber === null) {
+    return ElMessage.error('请填写税号')
+  }
+  if (type === '提交' && props.buttonType !== '编辑') {
+    getSoucreListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (type === '提交' && props.buttonType === '编辑') {
+    formInline.value.id = props.infoId
+    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,
+    }
+    getSoucreLisListExport(params).then((res) => {
+      exportFile(res.data, '溯源供方详情')
+    })
+  }
+}
+const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
+  ElMessage.warning('只能上传一个文件')
+}
+// 移除时触发
+const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
+  return ElMessageBox.confirm(
+    `确认移除${uploadFile.name}文件吗 ?`,
+  ).then(
+    () => true,
+    () => false,
+
+  )
+}
+const isShow = ref(false)
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  reader.onload = (e) => {
+    testForm.value.fileContent = e.target!.result?.replace(
+      /\n|\r\n/g,
+      '<br/>',
+    )
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: File) => {
+  UploadFile(file).then((res) => {
+    if (res.code === 200) {
+      formInline.value.minioFileName = res.data.fileName
+      // fileList.value.push({
+      //   name: res.data.fileName,
+      //   url: res.data.fileId,
+      //   // type: file.file.type,
+      // })
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+    }
+  })
+}
+if (props.buttonType !== '') {
+  getInfo()
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        基本信息
+      </h4>
+      <div>
+        <el-button v-for="item in buttonArray" :key="item" type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+          {{ item }}
+        </el-button>
+        <el-button type="warning" @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="100"
+        label-position="left"
+      >
+        <div class="content-top">
+          <span>
+            <el-form-item label="溯源供方编号:">
+              <el-input
+                v-model="formInline.supplierNo"
+                :placeholder="buttonType === '详情' ? '无' : '请输入溯源供方编号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="税号:">
+              <el-input v-model="formInline.taxNumber" :placeholder="buttonType === '详情' ? '无' : '请输入税号'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮编:">
+              <el-input v-model="formInline.postalCode" :placeholder="buttonType === '详情' ? '无' : '请输入邮编'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="手机:">
+              <el-input v-model="formInline.mobile" :placeholder="buttonType === '详情' ? '无' : '请输入手机'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司名称:">
+              <el-input
+                v-model="formInline.supplierName"
+                :placeholder="buttonType === '详情' ? '无' : '请输入公司名称'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账户名:">
+              <el-input
+                v-model="formInline.bankAccount"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账户名'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="负责人:">
+              <el-input v-model="formInline.director" :placeholder="buttonType === '详情' ? '无' : '请输入负责人'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="邮箱:">
+              <el-input v-model="formInline.mailbox" :placeholder="buttonType === '详情' ? '无' : '请输入邮箱'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="公司简称:">
+              <el-input v-model="formInline.briefName" :placeholder="buttonType === '详情' ? '无' : '请输入公司简称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="银行名称:">
+              <el-input v-model="formInline.bankName" :placeholder="buttonType === '详情' ? '无' : '请输入银行名称'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="电话:">
+              <el-input v-model="formInline.phone" :placeholder="buttonType === '详情' ? '无' : '请输入电话'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+            <el-form-item label="网址:">
+              <el-input v-model="formInline.website" :placeholder="buttonType === '详情' ? '无' : '请输入网址'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+          <span>
+            <el-form-item label="业务内容:">
+              <el-input
+                v-model="formInline.businessContent"
+                :placeholder="buttonType === '详情' ? '无' : '请输入业务内容'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="银行账号:">
+              <el-input
+                v-model="formInline.bankAccountNumber"
+                :placeholder="buttonType === '详情' ? '无' : '请输入银行账号'"
+                :disabled="buttonType === '详情'"
+              />
+            </el-form-item>
+            <el-form-item label="传真:">
+              <el-input v-model="formInline.fax" :placeholder="buttonType === '详情' ? '无' : '请输入传真'" :disabled="buttonType === '详情'" />
+            </el-form-item>
+          </span>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="公司地址:">
+            <el-select v-model="formInline.companyCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.companyProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getCompanyAddress('0')" @change="changeProvince">
+              <el-option v-for="province in provinceList" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.companyCity" placeholder="市" :disabled="buttonType === '详情'" @change="cityChange">
+              <el-option v-for="city in cityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.companyArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.companyAddress"
+              placeholder="公司详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <div class="info-dizhi">
+          <el-form-item label="开票地址:">
+            <el-select v-model="formInline.invoiceCountry" placeholder="国别" :disabled="buttonType === '详情'">
+              <el-option label="中国" value="中国" />
+            </el-select>
+            <el-select v-model="formInline.invoiceProvince" placeholder="省" :disabled="buttonType === '详情'" @click="getinvoiceProvinceList('0')" @change="changeInvoice">
+              <el-option v-for="province in invoiceProvince" :key="province.id" :label="province.areaName" :value="province.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceCity" placeholder="市" :disabled="buttonType === '详情'" @change="invoiceCityChange">
+              <el-option v-for="city in invoiceCityList" :key="city.id" :label="city.areaName" :value="city.id" />
+            </el-select>
+            <el-select v-model="formInline.invoiceArea" placeholder="区/县" :disabled="buttonType === '详情'">
+              <el-option v-for="area in areaInvoiceList" :key="area.id" :label="area.areaName" :value="area.id" />
+            </el-select>
+            <el-input
+              v-model="formInline.invoiceAddress"
+              placeholder="开票详细地址"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+        <span class="input-width">
+          <el-form-item label="公司业务范围:">
+            <el-input
+              v-model="formInline.businessScope"
+              :placeholder="buttonType === '详情' ? '无' : '请输入公司业务范围'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <span class="input-width">
+          <el-form-item label="备注:">
+            <el-input v-model="formInline.remark" :placeholder="buttonType === '详情' ? '无' : '请输入备注'" :disabled="buttonType === '详情'" />
+          </el-form-item>
+        </span>
+        <div class="info-appendix">
+          <el-form-item label="附件:">
+            <el-upload
+              v-model:file-list="fileList"
+              enctype="multipart/form-data"
+              :http-request="uploadQuarterlyEvaluateFile"
+              :before-remove="beforeRemove"
+              :on-exceed="handleExceed"
+              :on-preview="uploadShow"
+              :on-change="handleFileChange"
+              :limit="1"
+            >
+              <el-button :disabled="buttonType === '详情'">
+                上传
+              </el-button>
+            </el-upload>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="formInline.traceSupplierPersonList" border style="width: 100%;" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" />
+      <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" />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item v-for="column in columns" :key="column.value" :label="column.text" :prop="addPersonList[column.value]">
+        <el-input v-model="addPersonList[column.value]" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+  <!-- <el-dialog
+        title="文件预览"
+        :visible="isShow"
+        @close="isShow = false"
+        width="40%"
+        append-to-body
+      >
+        <div v-html="testForm.fileContent"></div>
+      </el-dialog> -->
+</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/notPass.vue b/src/views/measure/source/components/notPass.vue
index 3bd125a..5a4b817 100644
--- a/src/views/measure/source/components/notPass.vue
+++ b/src/views/measure/source/components/notPass.vue
@@ -1,8 +1,10 @@
 <!-- 未通过 -->
 <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="未通过" />
+  <list-page name="未通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/components/passed.vue b/src/views/measure/source/components/passed.vue
index edf5168..31cd21c 100644
--- a/src/views/measure/source/components/passed.vue
+++ b/src/views/measure/source/components/passed.vue
@@ -1,8 +1,10 @@
 <!-- 通过 -->
 <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="已通过" />
+  <list-page name="已通过" :buttoms="buttoms" />
 </template>
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 2680597..a37b9be 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -253,10 +253,10 @@
         基本信息
       </h4>
       <div>
-        <el-button type="primary" plain @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
+        <el-button type="primary" @click="getAddList(buttonType === '详情' ? '导出' : '提交')">
           {{ buttonType === '详情' ? '导出' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/components/all.vue b/src/views/measure/train/components/all.vue
new file mode 100644
index 0000000..d124307
--- /dev/null
+++ b/src/views/measure/train/components/all.vue
@@ -0,0 +1,17 @@
+<!-- 全部 -->
+<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/train/components/approvalPending.vue b/src/views/measure/train/components/approvalPending.vue
new file mode 100644
index 0000000..8a7a8bc
--- /dev/null
+++ b/src/views/measure/train/components/approvalPending.vue
@@ -0,0 +1,16 @@
+<!-- 待审批 -->
+<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/train/components/canceled.vue b/src/views/measure/train/components/canceled.vue
new file mode 100644
index 0000000..3b9657c
--- /dev/null
+++ b/src/views/measure/train/components/canceled.vue
@@ -0,0 +1,15 @@
+<!-- 取消 -->
+<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/train/components/draftBox.vue b/src/views/measure/train/components/draftBox.vue
new file mode 100644
index 0000000..43d7b75
--- /dev/null
+++ b/src/views/measure/train/components/draftBox.vue
@@ -0,0 +1,15 @@
+<!-- 草稿箱 -->
+<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/train/components/examineAndApprove.vue b/src/views/measure/train/components/examineAndApprove.vue
new file mode 100644
index 0000000..c13f95a
--- /dev/null
+++ b/src/views/measure/train/components/examineAndApprove.vue
@@ -0,0 +1,17 @@
+<!-- 审批中 -->
+<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/train/components/listPage.vue b/src/views/measure/train/components/listPage.vue
new file mode 100644
index 0000000..fc176a9
--- /dev/null
+++ b/src/views/measure/train/components/listPage.vue
@@ -0,0 +1,352 @@
+<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 { IlistQuery, IlistType } from '../list_interface'
+import ListPageAdd from './listPageAdd.vue'
+import { getSoucreList, getSoucreListDelete } from '@/api/system/source'
+import { uploadApi } from '@/api/system/notice'
+import { exportExcel } from '@/utils/exportXlsx'
+const props = defineProps({
+  name: {
+    type: String,
+    default: '全部',
+  },
+  buttoms: {
+    type: Array,
+    default: () => [],
+  },
+})
+// 查询条件
+const listQuery: Ref<IlistQuery> = ref({
+  supplierNo: '', // 业务内容
+  supplierName: '', // 溯源供方名称
+  businessContent: '', // 溯源供方编号
+  offset: 1,
+  limit: 10,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([])
+// 总数
+const total = ref(20)
+// 表头
+const columns = ref([
+  {
+    text: '计划编号',
+    value: 'supplierNo',
+    width: '160',
+  },
+  {
+    text: '培训名称',
+    value: 'supplierName',
+    width: '120',
+  },
+  {
+    text: '培训对象',
+    value: 'businessContent',
+  },
+  {
+    text: '培训人数',
+    value: 'briefName',
+  },
+  {
+    text: '培训学时',
+    value: 'director',
+  },
+  {
+    text: '培训时间',
+    value: 'mobile',
+  },
+  {
+    text: '主管部门',
+    value: 'companyCity',
+  },
+  {
+    text: '实施单位',
+    value: 'createTime',
+    width: '120',
+  },
+  {
+    text: '负责人',
+    value: 'remark',
+  },
+  {
+    text: '培训内容',
+    value: 'remark',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+  },
+  {
+    text: '审批状态',
+    value: 'remark',
+  },
+])
+
+// 选中的内容
+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
+  }
+  getSoucreList(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
+}
+// 点击编辑/详情
+const handleEdit = (index: string, row: object, value: string) => {
+  buttonType.value = value
+  infoId.value = row.id
+  show.value = false
+}
+// 点击删除
+const handleDelete = (index: string, row: object) => {
+  ElMessageBox.confirm(
+    `确认删除${row.supplierName}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      getSoucreListDelete({ id: row.id as string }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    supplierNo: '', // 业务内容
+    supplierName: '', // 溯源供方名称
+    businessContent: '', // 溯源供方编号
+    offset: 1,
+    limit: 20,
+  }
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 导出
+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 exportAll = () => {
+  exportExcelBtn()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '溯源供方编号模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierNo"
+            type="datetime"
+            placeholder="培训时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="listQuery.supplierName"
+            type="datetime"
+            placeholder="创建时间"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            :disabled="buttonType === '详情'"
+          />
+        </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-item>
+          <el-input
+            v-model.trim="listQuery.businessContent"
+            placeholder="负责人"
+            clearable
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <el-button type="primary" @click="exportAll">
+            导出
+          </el-button>
+          <el-button v-print="printObj" type="primary">
+            打印
+          </el-button>
+        </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 in buttoms"
+                  :key="item"
+                  size="small"
+                  :type="item.type" link
+                  @click="handleEdit(row.$index, row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+
+  <list-page-add
+    v-else
+    :info-id="infoId"
+    :button-type="buttonType"
+    @close="close"
+  />
+</template>
+
+<style lang="scss" scoped>
+.pagination {
+  position: fixed;
+  bottom: 0;
+}
+</style>
diff --git a/src/views/measure/train/components/listPageAdd.vue b/src/views/measure/train/components/listPageAdd.vue
new file mode 100644
index 0000000..8c73928
--- /dev/null
+++ b/src/views/measure/train/components/listPageAdd.vue
@@ -0,0 +1,410 @@
+<script lang="ts" setup name="PlanAdd">
+import {
+  getDeptTree,
+  getListAdd,
+  getListDetail,
+  getListUpdate,
+} from '@/api/system/plan'
+
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close'])
+const formInline = ref({
+  createTime: null,
+  deptId: null,
+  deptName: null,
+  director: null,
+  effectiveCompany: null,
+  id: null,
+  planName: null,
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: null,
+  trainStaffList: [],
+  trainTime: null,
+})
+// 主管部门下拉框
+const options = ref([])
+const columns = [
+  { text: '学员名称', value: 'name' },
+  { text: '单位名称', value: 'company' },
+  { text: '技术职称', value: 'technologyJob' },
+  { text: '签到时间', value: 'signTime', type: '下拉' },
+]
+const dialogVisible = ref(false)
+const addPersonList = ref({
+  company: '',
+  examResult: '',
+  id: 0,
+  name: '',
+  remark: '',
+  signTime: '',
+  staffId: 0,
+  technologyJob: '',
+})
+const SelectionList = ref([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const close = () => {
+  emit('close')
+}
+const addRoow = () => {
+  Object.keys(addPersonList.value).forEach(
+    key => (addPersonList.value[key] = ''),
+  )
+  dialogVisible.value = true
+}
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 点击弹窗的完成追加到表格数组中
+const addPushList = () => {
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
+  )
+  handleClose()
+}
+// 删除行
+const deleteList = () => {
+  formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
+    (item) => {
+      return !SelectionList.value.includes(item)
+    },
+  )
+}
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+if (props.infoId && props.infoId !== '') {
+  getListDetail({ id: props.infoId }).then((res) => {
+    formInline.value = res.data
+  })
+}
+const getAddList = (buttonType: string) => {
+  if (buttonType === '提交' && props.buttonType !== '编辑') {
+    getListAdd(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else if (buttonType === '提交' && props.buttonType === '编辑') {
+    formInline.value.trainStaffList.map((item) => {
+      delete item.updateTime
+      delete item.createTime
+    })
+    formInline.value.id = props.infoId
+    getListUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+    const printObj = ref({
+      id: 'print', // 需要打印元素的id
+      popTitle: '证书报告模板', // 打印配置页上方的标题
+      extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+      preview: false, // 是否启动预览模式，默认是false
+      previewBeforeOpenCallback() {
+        console.log('正在加载预览窗口！')
+      }, // 预览窗口打开之前的callback
+      previewOpenCallback() {
+        console.log('已经加载完预览窗口，预览打开了！')
+      }, // 预览窗口打开时的callback
+      beforeOpenCallback() {
+        console.log('开始打印之前！')
+      }, // 开始打印之前的callback
+      openCallback() {
+        console.log('执行打印了！')
+      }, // 调用打印时的callback
+      closeCallback() {
+        console.log('关闭了打印工具！')
+      }, // 关闭打印的callback(无法区分确认or取消)
+      clickMounted() {
+        console.log('点击v-print绑定的按钮了！')
+      },
+      standard: '',
+      extarCss: '',
+    })
+  }
+}
+</script>
+
+<template>
+  <app-container>
+    <div class="top-info">
+      <h4 class="title">
+        培训计划
+      </h4>
+      <div>
+        <el-button
+          v-print="buttonType === '详情' ? printObj : ''"
+          type="primary"
+          plain
+          @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
+        >
+          {{ buttonType === '详情' ? '打印' : '提交' }}
+        </el-button>
+        <el-button type="warning" plain @click="close">
+          关闭
+        </el-button>
+      </div>
+    </div>
+    <div class="info-content">
+      <el-form
+        :inline="true"
+        :model="formInline"
+        class="demo-form-inline"
+        label-width="80"
+        label-position="left"
+      >
+        <el-form-item label="计划编号:">
+          <el-input
+            v-model="formInline.planNo"
+            :placeholder="buttonType === '详情' ? '无' : '请输入计划编号'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训名称:">
+          <el-input
+            v-model="formInline.planName"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训名称'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训对象:">
+          <el-input
+            v-model="formInline.trainPerson"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训对象'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训人数:">
+          <el-input
+            v-model="formInline.trainNumber"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训人数'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="time">
+          <el-form-item label="培训时间:" label-width="auto">
+            <el-date-picker
+              v-model="formInline.trainTime"
+              type="datetime"
+              placeholder="培训时间"
+              format="YYYY/MM/DD HH:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <el-form-item label="培训学时:" label-width="auto">
+          <el-input
+            v-model="formInline.trainHour"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训学时'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="主管部门:" label-width="auto">
+          <el-select
+            v-model="formInline.deptName"
+            clearable
+            placeholder="主管部门"
+            size="default"
+            :disabled="buttonType === '详情'"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="实施单位:" label-width="auto">
+          <el-input
+            v-model="formInline.effectiveCompany"
+            :placeholder="buttonType === '详情' ? '无' : '请输入实施单位'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="负责人:">
+          <el-input
+            v-model="formInline.director"
+            :placeholder="buttonType === '详情' ? '无' : '请输入负责人'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <el-form-item label="培训地点:">
+          <el-input
+            v-model="formInline.trainAddress"
+            :placeholder="buttonType === '详情' ? '无' : '请输入培训地点'"
+            :disabled="buttonType === '详情'"
+          />
+        </el-form-item>
+        <span class="input-width">
+          <el-form-item label="培训内容:">
+            <el-input
+              v-model="formInline.trainContent"
+              :placeholder="buttonType === '详情' ? '无' : '请输入培训内容'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </span>
+        <div class="input-width">
+          <el-form-item label="备注:">
+            <el-input
+              v-model="formInline.remark"
+              :placeholder="buttonType === '详情' ? '无' : '请输入备注'"
+              :disabled="buttonType === '详情'"
+            />
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="table-top">
+      <div class="table-top-title">
+        人员信息
+      </div>
+      <div v-if="buttonType !== '详情'" class="table-top-button">
+        <el-button :disabled="buttonType === '详情'" @click="deleteList">
+          删除行
+        </el-button>
+        <el-button :disabled="buttonType === '详情'" @click="addRoow">
+          增加行
+        </el-button>
+      </div>
+    </div>
+    <el-table
+      :data="formInline.trainStaffList"
+      border
+      style="width: 100%;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <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"
+      />
+    </el-table>
+  </app-container>
+  <el-dialog
+    v-model="dialogVisible"
+    title="添加人员信息"
+    width="30%"
+    :before-close="handleClose"
+    center
+  >
+    <el-form
+      ref="addPersonListForm"
+      label-position="left"
+      label-width="100px"
+      :model="addPersonList"
+      style="max-width: 460px;"
+    >
+      <el-form-item label="学员名称">
+        <el-input v-model="addPersonList.name" />
+      </el-form-item>
+      <el-form-item label="单位名称">
+        <el-input v-model="addPersonList.company" />
+      </el-form-item>
+      <el-form-item label="技术职称">
+        <el-input v-model="addPersonList.technologyJob" />
+      </el-form-item>
+      <el-form-item label="签到时间">
+        <el-date-picker
+          v-model="addPersonList.signTime"
+          type="datetime"
+          placeholder="签到时间"
+          format="YYYY/MM/DD HH:mm:ss"
+          value-format="YYYY-MM-DD h:m:s"
+          :disabled="buttonType === '详情'"
+        />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="dialog-button" @click="addPushList">
+      完成
+    </el-button>
+  </el-dialog>
+</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;
+
+  .info-dizhi {
+    margin-right: 155px;
+  }
+}
+
+.input-width .el-input {
+  width: 30vw;
+}
+
+.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/train/components/notPass.vue b/src/views/measure/train/components/notPass.vue
new file mode 100644
index 0000000..5a4b817
--- /dev/null
+++ b/src/views/measure/train/components/notPass.vue
@@ -0,0 +1,10 @@
+<!-- 未通过 -->
+<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/train/components/passed.vue b/src/views/measure/train/components/passed.vue
new file mode 100644
index 0000000..31cd21c
--- /dev/null
+++ b/src/views/measure/train/components/passed.vue
@@ -0,0 +1,10 @@
+<!-- 通过 -->
+<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/train/plan.vue b/src/views/measure/train/plan.vue
index 21be0d5..fe96e36 100644
--- a/src/views/measure/train/plan.vue
+++ b/src/views/measure/train/plan.vue
@@ -70,7 +70,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '主管部门',
@@ -90,12 +90,12 @@
   {
     text: '创建时间',
     value: 'createTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '备注',
     value: 'remark',
-    width: '80',
+    width: '100',
   },
 ])
 // 搜索
@@ -305,7 +305,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="220">
+            <el-table-column label="操作" align="center" width="255">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/plan/edit')"
diff --git a/src/views/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 8c73928..214db19 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -165,12 +165,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainLog.vue b/src/views/measure/train/trainLog.vue
index e9e46f2..1a0b003 100644
--- a/src/views/measure/train/trainLog.vue
+++ b/src/views/measure/train/trainLog.vue
@@ -42,7 +42,7 @@
   {
     text: '记录编号',
     value: 'logNo',
-    width: '160',
+    width: '180',
   },
   {
     text: '培训名称',
@@ -52,7 +52,7 @@
   {
     text: '培训时间',
     value: 'trainTime',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训地点',
@@ -62,17 +62,17 @@
   {
     text: '培训学时',
     value: 'trainHour',
-    width: '90',
+    width: '100',
   },
   {
     text: '培训时间',
     value: 'trainPerson',
-    width: '120',
+    width: '180',
   },
   {
     text: '培训人数',
     value: 'trainNumber',
-    width: '90',
+    width: '100',
   },
   {
     text: '创建时间',
@@ -260,7 +260,7 @@
           :list-loading="loadingTable" is-showmulti-select @change="changePage" @multiSelect="handleSelectionChange"
         >
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="140">
               <template #default="{ row }">
                 <el-button
                   v-if="proxy.hasPerm('/measure/train/tarnLog/edit')"
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index bb9d6a9..20bd24d 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -180,12 +180,11 @@
         <el-button
           v-print="buttonType === '详情' ? printObj : ''"
           type="primary"
-          plain
           @click="getAddList(buttonType === '详情' ? '打印' : '提交')"
         >
           {{ buttonType === '详情' ? '打印' : '提交' }}
         </el-button>
-        <el-button type="warning" plain @click="close">
+        <el-button type="warning" @click="close">
           关闭
         </el-button>
       </div>
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 3c8f0f4..abc147d 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -1,3 +1,55 @@
+<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 {
+  name: string
+  comp: 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 current = ref('全部')
+const currentComp = shallowRef(All)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+</script>
+
 <template>
-  <div>培训计划审批</div>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="currentComp" />
+  </div>
 </template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 76px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 1376467..9910a0d 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -135,7 +135,7 @@
         关 闭
       </el-button>
     </div> -->
-
+    <el-button>保存</el-button>
     <div class="fd-nav-content">
       <section class="dingflow-design">
         <!-- <div class="zoom">
diff --git a/src/views/system/notice/noteAdd.vue b/src/views/system/notice/noteAdd.vue
index d26e734..17b92d3 100644
--- a/src/views/system/notice/noteAdd.vue
+++ b/src/views/system/notice/noteAdd.vue
@@ -70,25 +70,25 @@
 const onFileChange = (event: any) => {
   // 原生上传图片
   // console.log(event.target.files)
-  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) {
-          ruleForm.minioFileName = res.data[0]
-          ElMessage.success('上传成功')
-        }
-        else {
-          ElMessage.error(res.message)
-        }
-      })
-    }
+  // 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) {
+        ruleForm.minioFileName = res.data[0]
+        ElMessage.success('上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
   }
-  else {
-    ElMessage.error('请上传pdf格式')
-  }
+  // }
+  // else {
+  //   ElMessage.error('请上传pdf格式')
+  // }
 }
 const upload = () => {
   fileRef.value.click()
@@ -225,6 +225,14 @@
 const look = () => {
   console.log(ruleForm.noticeContent)
 }
+const minioFileUrl = ref('')
+watch(() => ruleForm.minioFileName, (newVal) => {
+  if (newVal) {
+    getPhotoUrl(newVal).then((res) => {
+      minioFileUrl.value = res.data
+    })
+  }
+})
 </script>
 
 <template>
@@ -279,9 +287,11 @@
         <!-- <el-input v-model.trim="ruleForm.noticeContent" :rows="4" type="textarea" /> -->
       </el-form-item>
       <el-form-item label="附件" prop="minioFileName">
-        <span>{{ ruleForm.minioFileName }}</span>
-        <el-button type="primary" @click="upload">
-          上传
+        <el-link v-if="ruleForm.minioFileName" :href="minioFileUrl" type="primary" target="_blank">
+          {{ ruleForm.minioFileName }}
+        </el-link>
+        <el-button type="primary" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+          {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="false" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">
       </el-form-item>
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index ea89ddc..85898ea 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -1,11 +1,12 @@
 <script lang="ts" setup name="Process">
 import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { Delete } from '@element-plus/icons-vue'
 import type { IlistQuery } from './process'
 import EditProcess from './editProcess.vue'
 import DetailProcess from './detailProcess.vue'
 import { delLoginLog, getLoginLogList } from '@/api/system/log'
+import { exportExcel } from '@/utils/exportXlsx'
 
 const { proxy } = getCurrentInstance() as any
 const active = ref('main')
@@ -17,7 +18,7 @@
   time: '', // 创建时间
   status: '', // 当前流程状态,
   offset: 1,
-  limit: 20,
+  limit: 10,
 })
 const columns = ref([
   {
@@ -42,6 +43,10 @@
     value: 'person',
   },
   {
+    text: '创建时间',
+    value: 'createTime',
+  },
+  {
     text: '流程描述',
     value: 'describe',
   },
@@ -110,7 +115,12 @@
 
 // 重置
 const reset = () => {
-  console.log('点击重置')
+  listQuery.number = '' // 编号
+  listQuery.name = '' // 名称
+  listQuery.business = '' // 关联业务
+  listQuery.person = '' // 负责人
+  listQuery.time = '' // 创建时间
+  listQuery.status = '' // 当前流程状态,
 }
 // 编辑
 const edit = (row: IlistQuery) => {
@@ -134,6 +144,66 @@
 const close = () => {
   active.value = 'main'
 }
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // fetchData({ ...listQuery, limit: 9999999, offset: 1 }).then((res) => {
+  //   if (res.code === 200) {
+  //     exportExcel({
+  //       json: res.data.rows.map((item: IlistQuery, index: number) => ({ index: index + 1, noticeNo: item.noticeNo, noticeTitle: item.noticeTitle, noticePublisher: item.noticePublisher, noticeSketch: item.noticeSketch, noticeTime: item.noticeTime })),
+  //       name: '通知公告',
+  //       titleArr: ['序号', '流程编号', '流程名称', '关联业务', '当前流程状态', '流程负责人', '创建时间', '流程描述'],
+  //       sheetName: 'sheet1',
+  //     })
+  //   }
+  //   loading.close()
+  // }).catch((_) => {
+  //   loading.close()
+  // })
+  exportExcel({
+    json: list.value.map((item: IlistQuery, index: number) => (
+      {
+        index: index + 1,
+        number: item.number,
+        name: item.name,
+        business: item.business,
+        status: item.status,
+        person: item.person,
+        time: item.time,
+        describe: item.describe,
+      }
+    )),
+    name: '流程管理',
+    titleArr: ['序号', '流程编号', '流程名称', '关联业务', '当前流程状态', '流程负责人', '创建时间', '流程描述'],
+    sheetName: 'sheet1',
+  })
+  loading.close()
+}
+// 打印
+const printObj = ref({
+  id: 'print', // 需要打印元素的id
+  popTitle: '流程管理', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  previewBeforeOpenCallback() { console.log('正在加载预览窗口！') }, // 预览窗口打开之前的callback
+  previewOpenCallback() { console.log('已经加载完预览窗口，预览打开了！') }, // 预览窗口打开时的callback
+  beforeOpenCallback() { console.log('开始打印之前！') }, // 开始打印之前的callback
+  openCallback() { console.log('执行打印了！') }, // 调用打印时的callback
+  closeCallback() { console.log('关闭了打印工具！') }, // 关闭打印的callback(无法区分确认or取消)
+  clickMounted() { console.log('点击v-print绑定的按钮了！') },
+  // url: 'http://localhost:8080/', // 打印指定的URL，确保同源策略相同
+  // asyncUrl (reslove) {
+  //   setTimeout(() => {
+  //     reslove('http://localhost:8080/')
+  //   }, 2000)
+  // },
+  standard: '',
+  extarCss: '',
+})
 </script>
 
 <template>
@@ -142,7 +212,7 @@
       <!-- 主页面 -->
       <div v-if="active === 'main'">
         <!-- 筛选条件 -->
-        <search-area @search="search">
+        <search-area :need-clear="true" @search="search" @clear="reset">
           <search-item>
             <el-input
               v-model.trim="listQuery.number"
@@ -186,42 +256,55 @@
               placeholder="创建时间"
             />
           </search-item>
-          <template #btns>
-            <el-button class="filter-item" type="info" :icon="Delete" :style="{ marginTop: '-10px' }" @click="reset">
-              重置
-            </el-button>
-          </template>
         </search-area>
         <!-- 查询结果Table显示 -->
-        <div class="table-area">
-          <normal-table
-            :data="list"
-            :total="total"
-            :columns="columns"
-            :query="listQuery"
-            :list-loading="listLoading"
-            @change="changePage"
-          >
-            <template #columns>
-              <el-table-column label="操作" width="200" align="center">
-                <template #default="scope">
-                  <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
-                    编辑
-                  </el-button>
-                  <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
-                    详情
-                  </el-button>
-                  <el-button type="primary" link size="small" class="table-text-button" @click="abolish(scope.row)">
-                    废止
-                  </el-button>
-                  <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
-                    删除
-                  </el-button>
-                </template>
-              </el-table-column>
-            </template>
-          </normal-table>
-        </div>
+        <table-container>
+          <template #btns-right>
+            <el-button type="primary" @click="exportExcelBtn">
+              导出
+            </el-button>
+            <el-button v-print="printObj" type="primary">
+              打印
+            </el-button>
+          </template>
+
+          <div class="table-area">
+            <normal-table
+              :data="list"
+              :total="total"
+              :columns="columns"
+              :query="listQuery"
+              :list-loading="listLoading"
+              @change="changePage"
+            >
+              <template #preColumns>
+                <el-table-column label="#" width="55" align="center">
+                  <template #default="scope">
+                    {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+                  </template>
+                </el-table-column>
+              </template>
+              <template #columns>
+                <el-table-column label="操作" width="200" align="center">
+                  <template #default="scope">
+                    <el-button type="primary" link size="small" class="table-text-button" @click="edit(scope.row)">
+                      编辑
+                    </el-button>
+                    <el-button type="primary" link size="small" class="table-text-button" @click="detail(scope.row)">
+                      详情
+                    </el-button>
+                    <el-button type="primary" link size="small" class="table-text-button" @click="abolish(scope.row)">
+                      废止
+                    </el-button>
+                    <el-button type="primary" link size="small" class="table-text-button" @click="del(scope.row)">
+                      删除
+                    </el-button>
+                  </template>
+                </el-table-column>
+              </template>
+            </normal-table>
+          </div>
+        </table-container>
       </div>
       <!-- 编辑 -->
       <div v-if="active === 'edit'">
diff --git a/src/views/system/tool/certificate/addDDialog.vue b/src/views/system/tool/certificate/addDDialog.vue
index c0d0b58..330f2de 100644
--- a/src/views/system/tool/certificate/addDDialog.vue
+++ b/src/views/system/tool/certificate/addDDialog.vue
@@ -194,7 +194,7 @@
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" @change="onFileChange">
diff --git a/src/views/system/tool/document/addDDialog.vue b/src/views/system/tool/document/addDDialog.vue
index 7c8c7ea..33ffdaa 100644
--- a/src/views/system/tool/document/addDDialog.vue
+++ b/src/views/system/tool/document/addDDialog.vue
@@ -195,7 +195,7 @@
       </el-form-item> -->
       <el-form-item label="附件" prop="minioFileName">
         <show-photo :minio-file-name="ruleForm.minioFileName" />
-        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" @click="upload">
+        <el-button v-if="title !== '详情'" type="primary" :disabled="title === '详情'" :style="{ 'margin-left': ruleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
           {{ ruleForm.minioFileName === '' ? '上传' : '更换附件' }}
         </el-button>
         <input v-show="title === ''" ref="fileRef" type="file" accept="pdf/*" @change="onFileChange">