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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>

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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {

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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>

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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d0b7fcc..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -8,6 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -270,13 +271,13 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d0b7fcc..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -8,6 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -270,13 +271,13 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 4889b45..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <list :is-remind="true" />
+  <list :is-remind="true" authority="remind" />
 </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d0b7fcc..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -8,6 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -270,13 +271,13 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 4889b45..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <list :is-remind="true" />
+  <list :is-remind="true" authority="remind" />
 </template>
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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d0b7fcc..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -8,6 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -270,13 +271,13 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 4889b45..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <list :is-remind="true" />
+  <list :is-remind="true" authority="remind" />
 </template>
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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d0b7fcc..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -8,6 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -270,13 +271,13 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 4889b45..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <list :is-remind="true" />
+  <list :is-remind="true" authority="remind" />
 </template>
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/notice/noteList.vue b/src/views/system/notice/noteList.vue
index b9fc320..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d0b7fcc..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -8,6 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -270,13 +271,13 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 4889b45..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <list :is-remind="true" />
+  <list :is-remind="true" authority="remind" />
 </template>
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/notice/noteList.vue b/src/views/system/notice/noteList.vue
index b9fc320..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d0b7fcc..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -8,6 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -270,13 +271,13 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 4889b45..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <list :is-remind="true" />
+  <list :is-remind="true" authority="remind" />
 </template>
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/notice/noteList.vue b/src/views/system/notice/noteList.vue
index b9fc320..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
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/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index e44c6c7..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d0b7fcc..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -8,6 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -270,13 +271,13 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 4889b45..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <list :is-remind="true" />
+  <list :is-remind="true" authority="remind" />
 </template>
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/notice/noteList.vue b/src/views/system/notice/noteList.vue
index b9fc320..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
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/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index e44c6c7..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d0b7fcc..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -8,6 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -270,13 +271,13 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 4889b45..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <list :is-remind="true" />
+  <list :is-remind="true" authority="remind" />
 </template>
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/notice/noteList.vue b/src/views/system/notice/noteList.vue
index b9fc320..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
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/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index e44c6c7..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
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/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index e84b685..5ac1900 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -7,8 +7,9 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -191,13 +192,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -217,16 +218,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d0b7fcc..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -8,6 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -270,13 +271,13 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 4889b45..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <list :is-remind="true" />
+  <list :is-remind="true" authority="remind" />
 </template>
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/notice/noteList.vue b/src/views/system/notice/noteList.vue
index b9fc320..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
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/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index e44c6c7..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
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/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index e84b685..5ac1900 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -7,8 +7,9 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -191,13 +192,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -217,16 +218,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
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">

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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d0b7fcc..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -8,6 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -270,13 +271,13 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 4889b45..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <list :is-remind="true" />
+  <list :is-remind="true" authority="remind" />
 </template>
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/notice/noteList.vue b/src/views/system/notice/noteList.vue
index b9fc320..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
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/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index e44c6c7..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
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/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index e84b685..5ac1900 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -7,8 +7,9 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -191,13 +192,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -217,16 +218,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
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">
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 178b577..58d12f9 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -8,6 +8,7 @@
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,16 +217,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </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/file/components/CNASfile.vue b/src/views/measure/file/components/CNASfile.vue
index b53f401..9a634b3 100644
--- a/src/views/measure/file/components/CNASfile.vue
+++ b/src/views/measure/file/components/CNASfile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="CNAS文件" />
+  <template-pag name="CNAS文件" authority="quality" />
 </template>
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/file/components/homeworkFile.vue b/src/views/measure/file/components/homeworkFile.vue
index 9d1c3c7..fb1d15c 100644
--- a/src/views/measure/file/components/homeworkFile.vue
+++ b/src/views/measure/file/components/homeworkFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="作业文件" />
+  <template-pag name="作业文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/programFile.vue b/src/views/measure/file/components/programFile.vue
index 4e9a8f1..3da3306 100644
--- a/src/views/measure/file/components/programFile.vue
+++ b/src/views/measure/file/components/programFile.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="程序文件" />
+  <template-pag name="程序文件" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/qualityManual.vue b/src/views/measure/file/components/qualityManual.vue
index d220d4e..d2a8e04 100644
--- a/src/views/measure/file/components/qualityManual.vue
+++ b/src/views/measure/file/components/qualityManual.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="质量手册" />
+  <template-pag name="质量手册" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/statute.vue b/src/views/measure/file/components/statute.vue
index 151649e..1c77dd7 100644
--- a/src/views/measure/file/components/statute.vue
+++ b/src/views/measure/file/components/statute.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量法规" />
+  <template-pag name="计量法规" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/technicalCapability.vue b/src/views/measure/file/components/technicalCapability.vue
index c50c700..776fb34 100644
--- a/src/views/measure/file/components/technicalCapability.vue
+++ b/src/views/measure/file/components/technicalCapability.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="技术能力" />
+  <template-pag name="技术能力" authority="quality" />
 </template>
diff --git a/src/views/measure/file/components/templatePage.vue b/src/views/measure/file/components/templatePage.vue
index cab8511..d38e09d 100644
--- a/src/views/measure/file/components/templatePage.vue
+++ b/src/views/measure/file/components/templatePage.vue
@@ -5,7 +5,7 @@
 import type { fileListType, fileResType, fileSearchType } from '@/views/measure/file/file-interface'
 import { deleteApi, exportFileApi, listPageApi, updateApi } from '@/api/measure/file'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { uploadApi } from '@/api/system/notice'
 import { exportFile } from '@/utils/exportUtils'
 const props = defineProps({
@@ -13,7 +13,12 @@
     type: String,
     default: '',
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<fileSearchType>({
   fileNo: '', // 编号
   fileName: '', // 名称
@@ -260,7 +265,7 @@
           <el-input v-model="searchQuery.fileCode" placeholder="文件号" clearable class="w-50 m-2 normal-input" />
         </search-item>
         <search-item>
-          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别">
+          <el-select v-model="searchQuery.fileType" class="m-2 normal-select" placeholder="类别" clearable>
             <el-option
               v-for="item in fileTypeList"
               :key="item.id"
@@ -301,19 +306,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/file/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -336,16 +341,16 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="200">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   查看
                 </el-button>
-                <el-button size="small" type="primary" link @click="exportSelf(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/download`)" size="small" type="primary" link @click="exportSelf(row)">
                   下载
                 </el-button>
-                <el-button size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/abolish`)" size="small" :type="row.effectiveStatus === '3' ? 'info' : 'primary'" link :disabled=" row.effectiveStatus === '3'" @click="abolish(row)">
                   废止
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/file/${authority}/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/file/manageMethod.vue b/src/views/measure/file/manageMethod.vue
index 2b55537..d584bef 100644
--- a/src/views/measure/file/manageMethod.vue
+++ b/src/views/measure/file/manageMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量管理办法" />
+  <template-pag name="计量管理办法" authority="ManageMethod" />
 </template>
diff --git a/src/views/measure/file/measureRule.vue b/src/views/measure/file/measureRule.vue
index d4effb3..89dc791 100644
--- a/src/views/measure/file/measureRule.vue
+++ b/src/views/measure/file/measureRule.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规程" />
+  <template-pag name="计量规程" authority="measureRule" />
 </template>
diff --git a/src/views/measure/file/rules.vue b/src/views/measure/file/rules.vue
index 380847a..0d30800 100644
--- a/src/views/measure/file/rules.vue
+++ b/src/views/measure/file/rules.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="计量规章制度" />
+  <template-pag name="计量规章制度" authority="rules" />
 </template>
diff --git a/src/views/measure/file/testingMethod.vue b/src/views/measure/file/testingMethod.vue
index 1e92a0a..382b7a9 100644
--- a/src/views/measure/file/testingMethod.vue
+++ b/src/views/measure/file/testingMethod.vue
@@ -4,5 +4,5 @@
 </script>
 
 <template>
-  <template-pag name="校验检测办法" />
+  <template-pag name="校验检测办法" authority="testingMethod" />
 </template>
diff --git a/src/views/measure/measureDept/bm.vue b/src/views/measure/measureDept/bm.vue
index deb281a..4451da2 100644
--- a/src/views/measure/measureDept/bm.vue
+++ b/src/views/measure/measureDept/bm.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-部门" />
+  <template-page name="计量组织-部门" authority="bm" />
 </template>
diff --git a/src/views/measure/measureDept/components/addDialog.vue b/src/views/measure/measureDept/components/addDialog.vue
index e43fe4f..4fede03 100644
--- a/src/views/measure/measureDept/components/addDialog.vue
+++ b/src/views/measure/measureDept/components/addDialog.vue
@@ -6,8 +6,10 @@
 import { getUserList } from '@/api/system/user'
 import { getDictByCode } from '@/api/system/dict'
 import type { userType } from '@/views/system/user/user-interface'
-import { updateApi } from '@/api/measure/measureDept'
+import { listPageApi, updateApi } from '@/api/measure/measureDept'
+import { getStaffList } from '@/api/measure/person'
 const emits = defineEmits(['resetData'])
+const router = useRoute()
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
   organizeType: '', // 类型
@@ -91,6 +93,12 @@
 const multipleTableRef = ref()
 const current = ref('')
 const changeList = ref<detailType[]>()
+// const searchQuery = ref({
+//   limit: 10,
+//   offset: 1,
+//   total: 0,
+//   pageSizes: [10, 20, 30],
+// })
 // 部门列表数据
 const changeList_bm = ref<detailType[]>([
   {
@@ -99,23 +107,23 @@
     column: [
       {
         label: '科室编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '科室名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -125,7 +133,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -154,23 +162,23 @@
     column: [
       {
         label: '工程组编号',
-        data: '',
+        data: 'organizeNo',
       },
       {
         label: '工程组名称',
-        data: '',
+        data: 'organizeName',
       },
       {
         label: '负责人姓名',
-        data: '',
+        data: 'director',
       },
       {
         label: '计量专业',
-        data: '',
+        data: 'meterMajor',
       },
       {
         label: '创建时间',
-        data: '',
+        data: 'createTime',
       },
     ],
   },
@@ -243,7 +251,7 @@
     column: [
       {
         label: '人员编号',
-        data: '',
+        data: 'staffNo',
       },
       {
         label: '姓名',
@@ -330,42 +338,95 @@
 })
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[0].data = response.data
-    changeList_ks.value[0].data = response.data
-  })
+  console.log(router.path.split('/')[2], '路由')
+  if (router.path.split('/')[2] === 'bm') {
+    // 获取科室
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '3',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '科室')
+      changeList_bm.value[0].data = res.data.rows
+    })
+  }
+  else if (router.path.split('/')[2] === 'ks') {
+    // 获取工程组
+    listPageApi({
+      organizeNo: '',
+      organizeName: '',
+      limit: 9999,
+      offset: 1,
+      organizeType: '4',
+      createTime: '', // 创建时间
+      director: '', // 负责人
+      meterMajor: '', // 专业
+      pDeptId: ruleForm.value.deptId, // 所属科室
+    }).then((res) => {
+      console.log(res, '工程组')
+      changeList_ks.value[0].data = res.data.rows
+    })
+  }
 }
 // 获取人员信息
 const getuserInfoList = () => {
-  // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_bm.value[1].data = response.data
-    changeList_gcz.value[0].data = response.data
+  const params = {
+    staffNo: '',
+    name: '',
+    deptId: ruleForm.value.deptId,
+    major: '',
+    verifierCertificateNo: '',
+    certificateStatus: '',
+    limit: 9999,
+    offset: 1,
+  }
+  getStaffList(params).then((response) => {
+    changeList_bm.value[1].data = response.data.records
+    changeList_gcz.value[0].data = response.data.records
   })
 }
 // 获取仪器信息
 const getInstrumentInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[1].data = response.data
-    changeList_gcz.value[1].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[1].data = response.data
+  //   changeList_gcz.value[1].data = response.data
+  // })
 }
 // 获取标准装置信息
 const getDeviceInfo = () => {
   // 接口暂未写好 根据实际情况赋值
-  getDictByCode('pDeptId').then((response) => {
-    changeList_ks.value[2].data = response.data
-    changeList_gcz.value[2].data = response.data
-  })
+  // getDictByCode('pDeptId').then((response) => {
+  //   changeList_ks.value[2].data = response.data
+  //   changeList_gcz.value[2].data = response.data
+  // })
 }
+// const handleSizeChange = (val: number) => {
+//   searchQuery.value.limit = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
+// const handleCurrentChange = (val: number) => {
+//   searchQuery.value.offset = val
+//   getDepartmentList()
+//   getuserInfoList()
+//   getInstrumentInfo()
+//   getDeviceInfo()
+// }
 // 弹窗初始化
 const initDialog = (row: any) => {
-  console.log(row, 'row')
   reset()
   title.value = row.title
   ruleForm.value.organizeType = row.organizeType
+  ruleForm.value.deptId = row.deptId
   getuser()
   getTechnologyJobList()
   getAdministrationJob()
@@ -475,16 +536,21 @@
           </span>
         </div>
         <el-table ref="multipleTableRef" :data="currentShow?.data || []" style="width: 100%;margin-top: 10px;" border stripe>
-          <!-- <el-table-column width="55" align="center">
-          <template #default="scope">
-            <el-radio-group v-model="currenSelect" class="ml-4">
-              <el-radio :label="scope.$index" />
-            </el-radio-group>
-          </template>
-        </el-table-column> -->
-          <el-table-column type="index" label="序号" width="55" />
+          <el-table-column type="index" label="序号" width="55" align="center" />
           <el-table-column v-for="item in currentShow?.column || []" :key="item.label" :prop="item.data" :label="item.label" align="center" />
         </el-table>
+        <!-- <div style="width: 100%;margin-top: 10px;">
+          <el-pagination
+            :current-page="searchQuery.offset"
+            :page-sizes="searchQuery.pageSizes"
+            :page-size="searchQuery.limit"
+            :total="searchQuery.total"
+            layout="total, sizes, prev, pager, next"
+            hide-on-single-page
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
+        </div> -->
       </div>
     </div>
   </app-container>
diff --git a/src/views/measure/measureDept/components/templatePage.vue b/src/views/measure/measureDept/components/templatePage.vue
index d71b3ee..9ad87af 100644
--- a/src/views/measure/measureDept/components/templatePage.vue
+++ b/src/views/measure/measureDept/components/templatePage.vue
@@ -13,7 +13,12 @@
     type: String,
     required: true,
   },
+  authority: {
+    type: String,
+    required: true,
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<searchQueryType>({
   organizeNo: '', // 组织编号
   organizeName: '', // 名称
@@ -62,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' },
     ],
@@ -96,8 +101,18 @@
 const DepartmentList = ref()
 // 获取科室/工程组信息
 const getDepartmentList = () => {
-  getDictByCode('pDeptId').then((response) => {
-    DepartmentList.value = response.data
+  listPageApi({
+    organizeNo: '',
+    organizeName: '',
+    limit: 99999,
+    offset: 1,
+    organizeType: '3',
+    createTime: '', // 创建时间
+    director: '', // 负责人
+    meterMajor: '', // 专业
+    pDeptId: '', // 所属科室
+  }).then((res) => {
+    DepartmentList.value = res.data.rows
   })
 }
 // 获取数据列表
@@ -201,8 +216,8 @@
           <el-input v-if="props.name.split('-')[1] !== '部门'" v-model="searchQuery.director" placeholder="负责人" clearable class="w-50 m-2 " />
         </search-item>
         <search-item>
-          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.organizeNo" placeholder="所属科室">
-            <el-option v-for="item in DepartmentList" :key="item.id" :label="item.name" :value="item.value" />
+          <el-select v-if="props.name.split('-')[1] === '工程组'" v-model="searchQuery.pDeptId" placeholder="所属科室">
+            <el-option v-for="item in DepartmentList" :key="item.deptId" :label="item.organizeName" :value="item.deptId" />
           </el-select>
         </search-item>
         <search-item>
@@ -216,10 +231,10 @@
       <table-container>
         <!-- 表头区域 -->
         <template #btns-right>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary">
+          <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/print`)" v-print="printObj" type="primary">
             打印
           </el-button>
         </template>
@@ -242,10 +257,10 @@
           <template #columns>
             <el-table-column label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/measureDept/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
               </template>
diff --git a/src/views/measure/measureDept/gcz.vue b/src/views/measure/measureDept/gcz.vue
index 9114f25..7121c66 100644
--- a/src/views/measure/measureDept/gcz.vue
+++ b/src/views/measure/measureDept/gcz.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-工程组" />
+  <template-page name="计量组织-工程组" authority="gcz" />
 </template>
diff --git a/src/views/measure/measureDept/ks.vue b/src/views/measure/measureDept/ks.vue
index c0dc1f5..15c89fe 100644
--- a/src/views/measure/measureDept/ks.vue
+++ b/src/views/measure/measureDept/ks.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <template-page name="计量组织-科室" />
+  <template-page name="计量组织-科室" authority="ks" />
 </template>
diff --git a/src/views/measure/measureDept/measureDept-interface.ts b/src/views/measure/measureDept/measureDept-interface.ts
index 6aecda8..5f7f5e7 100644
--- a/src/views/measure/measureDept/measureDept-interface.ts
+++ b/src/views/measure/measureDept/measureDept-interface.ts
@@ -1,14 +1,14 @@
 // 查询参数类型
 export interface searchQueryType {
-  organizeNo: string // 组织编号
-  organizeName: string // 名称
+  organizeNo?: string // 组织编号
+  organizeName?: string // 名称
   limit: number
   offset: number
-  organizeType: string // 类型
-  createTime: string // 创建时间
-  director: string // 负责人
-  meterMajor: string // 专业
-  pDeptId: string // 所属科室
+  organizeType?: string // 类型
+  createTime?: string // 创建时间
+  director?: string // 负责人
+  meterMajor?: string // 专业
+  pDeptId?: string // 所属科室
 }
 
 export interface columnType {
diff --git a/src/views/measure/person/certificateLog.vue b/src/views/measure/person/certificateLog.vue
index b5c2975..ca26b00 100644
--- a/src/views/measure/person/certificateLog.vue
+++ b/src/views/measure/person/certificateLog.vue
@@ -13,7 +13,12 @@
     type: Boolean,
     default: false,
   },
+  authority: {
+    type: String,
+    default: 'certificateLog',
+  },
 })
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -287,19 +292,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button v-if="!props.isRemind" type="primary" @click="batchImport">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="templateDownload">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button v-if="!props.isRemind" type="primary" @click="add">
+          <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -322,16 +327,16 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remind(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/remind`)" size="small" type="primary" link @click="remind(row)">
                   提醒
                 </el-button>
-                <el-button v-else size="small" type="primary" link @click="update(row)">
+                <el-button v-if="!props.isRemind && proxy.hasPerm(`/measure/person/${authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/${authority}/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button v-if="props.isRemind" size="small" type="primary" link @click="remove(row)">
+                <el-button v-if="props.isRemind && proxy.hasPerm(`/measure/person/${authority}/delete`)" size="small" type="primary" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/components/addPerson.vue b/src/views/measure/person/components/addPerson.vue
index 7f8e5b1..16a899c 100644
--- a/src/views/measure/person/components/addPerson.vue
+++ b/src/views/measure/person/components/addPerson.vue
@@ -14,10 +14,12 @@
 import { getDictByCode } from '@/api/system/dict'
 import comTreeSelect from '@/views/system/user/selecTree.vue'
 import { getStaffAdd, getStaffDetail, getStaffupdate } from '@/api/measure/person'
+import { getPhotoUrl } from '@/api/system/tool'
 // import showPhoto from '@/views/system/tool/showPhoto.vue'
 const emits = defineEmits(['resetData'])
 const ruleFormRef = ref<FormInstance>() // from组件
 const ruleForm = ref({
+  account: '',
   name: '', // 姓名
   minioFileName: '', // 照片
   idCard: '', // 省份证号
@@ -151,15 +153,17 @@
 // 保存选择人员信息
 const confirmPerson = (row: userType) => {
   ruleForm.value.name = row.name
-  console.log(ruleForm.value)
+  ruleForm.value.account = row.account
   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.fileId
+      ruleForm.value.minioFileName = res.data[0]
     }
   })
 }
@@ -345,6 +349,15 @@
   }
 }
 defineExpose({ initDialog })
+// 图片预览地址
+const photoUrl = ref('')
+watch(() => ruleForm.value.minioFileName, (newVal) => {
+  getPhotoUrl(newVal).then((res) => {
+    if (res.code === 200) {
+      photoUrl.value = res.data
+    }
+  })
+})
 </script>
 
 <template>
@@ -376,7 +389,7 @@
                 :disabled="title === '详情'"
               >
                 <!-- <show-photo v-if="ruleForm.minioFileName" :minio-file-name="ruleForm.minioFileName" width="178px" height="178px" /> -->
-                <img v-if="ruleForm.minioFileName" :src=" ` http://111.198.10.15:21409/static/${ruleForm.minioFileName}`" class="avatar">
+                <img v-if="ruleForm.minioFileName" :src="photoUrl" class="avatar">
                 <el-icon v-else class="avatar-uploader-icon">
                   <plus />
                 </el-icon>
diff --git a/src/views/measure/person/list.vue b/src/views/measure/person/list.vue
index d0b7fcc..ad2ece0 100644
--- a/src/views/measure/person/list.vue
+++ b/src/views/measure/person/list.vue
@@ -8,6 +8,7 @@
 import { getDeptTreeList } from '@/api/system/dept'
 import { exportFile } from '@/utils/exportUtils'
 import type { DeptTreeNode } from '@/views/system/dept/dept-interface'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<StaffListType>({
   staffNo: '', // 人员编号
   name: '', // 姓名
@@ -235,19 +236,19 @@
         <!-- 表头区域 -->
         <template #btns-right>
           <input v-show="(searchQuery.limit === 0)" ref="fileRef" type="file" multiple @change="onFileChange">
-          <el-button type="primary" @click="batchImport">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/import`)" type="primary" @click="batchImport">
             批量导入
           </el-button>
-          <el-button type="primary" @click="templateDownload">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/mould`)" type="primary" @click="templateDownload">
             模板下载
           </el-button>
-          <el-button type="primary" @click="add">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/add`)" type="primary" @click="add">
             新建
           </el-button>
-          <el-button type="primary" @click="exportExcelBtn">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/export`)" type="primary" @click="exportExcelBtn">
             导出
           </el-button>
-          <el-button v-print="printObj" type="primary" @click="print">
+          <el-button v-if="proxy.hasPerm(`/measure/person/list/print`)" v-print="printObj" type="primary" @click="print">
             打印
           </el-button>
         </template>
@@ -270,13 +271,13 @@
           <template #columns>
             <el-table-column fixed="right" label="操作" align="center" width="150">
               <template #default="{ row }">
-                <el-button size="small" type="primary" link @click="update(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
                 </el-button>
-                <el-button size="small" type="primary" link @click="detail(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/detail`)" size="small" type="primary" link @click="detail(row)">
                   详情
                 </el-button>
-                <el-button size="small" type="danger" link @click="remove(row)">
+                <el-button v-if="proxy.hasPerm(`/measure/person/list/delete`)" size="small" type="danger" link @click="remove(row)">
                   删除
                 </el-button>
               </template>
diff --git a/src/views/measure/person/remind.vue b/src/views/measure/person/remind.vue
index 4889b45..c3f8165 100644
--- a/src/views/measure/person/remind.vue
+++ b/src/views/measure/person/remind.vue
@@ -3,5 +3,5 @@
 </script>
 
 <template>
-  <list :is-remind="true" />
+  <list :is-remind="true" authority="remind" />
 </template>
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/notice/noteList.vue b/src/views/system/notice/noteList.vue
index b9fc320..3d5c2e3 100644
--- a/src/views/system/notice/noteList.vue
+++ b/src/views/system/notice/noteList.vue
@@ -10,6 +10,7 @@
 import { getNoticeeApi } from '@/api/system/notice'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { exportExcel } from '@/utils/exportXlsx'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   noticeNo: '', // 编号
   noticePublisher: '', // 发布人
@@ -171,13 +172,13 @@
     </search-area>
     <table-container>
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/notice/list/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -196,7 +197,7 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button type="primary" link size="small" @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/notice/list/detail')" type="primary" link size="small" @click="detail(row)">
                 查看
               </el-button>
             </template>
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/autograph/autograph.vue b/src/views/system/tool/autograph/autograph.vue
index e44c6c7..8fffe07 100644
--- a/src/views/system/tool/autograph/autograph.vue
+++ b/src/views/system/tool/autograph/autograph.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/autograph/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,13 +217,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/autograph/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
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/certificate/certificate.vue b/src/views/system/tool/certificate/certificate.vue
index e84b685..5ac1900 100644
--- a/src/views/system/tool/certificate/certificate.vue
+++ b/src/views/system/tool/certificate/certificate.vue
@@ -7,8 +7,9 @@
 import addDDialog from './addDDialog.vue'
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
-import { exportExcel } from '@/utils/exportXlsx'
+// import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -191,13 +192,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/certificate/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -217,16 +218,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="300">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/certificate/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
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">
diff --git a/src/views/system/tool/document/document.vue b/src/views/system/tool/document/document.vue
index 178b577..58d12f9 100644
--- a/src/views/system/tool/document/document.vue
+++ b/src/views/system/tool/document/document.vue
@@ -8,6 +8,7 @@
 import { templateDelete, templateExport, templatePage } from '@/api/system/tool'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive({
   templateNo: '', // 编号
   templateName: '', // 名称
@@ -190,13 +191,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/document/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -216,16 +217,16 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="primary" link @click="exportSele(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/download')" size="small" type="primary" link @click="exportSele(row)">
                 下载
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/document/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>
diff --git a/src/views/system/tool/signature/signature.vue b/src/views/system/tool/signature/signature.vue
index 11b73b6..94d216e 100644
--- a/src/views/system/tool/signature/signature.vue
+++ b/src/views/system/tool/signature/signature.vue
@@ -9,6 +9,7 @@
 import { getDictByCode } from '@/api/system/dict'
 // import { exportExcel } from '@/utils/exportXlsx'
 import { exportFile } from '@/utils/exportUtils'
+const { proxy } = getCurrentInstance() as any
 const searchQuery = reactive<queryType>({
   signNo: '', // 编号
   signName: '', // 名称
@@ -188,13 +189,13 @@
     <table-container>
       <!-- 表头区域 -->
       <template #btns-right>
-        <el-button type="primary" @click="add">
+        <el-button v-if="proxy.hasPerm('/sys/tool/signature/add')" type="primary" @click="add">
           新建
         </el-button>
-        <el-button type="primary" @click="exportExcelBtn">
+        <el-button v-if="proxy.hasPerm('/sys/tool/signature/export')" type="primary" @click="exportExcelBtn">
           导出
         </el-button>
-        <el-button v-print="printObj" type="primary">
+        <el-button v-if="proxy.hasPerm('/sys/tool/signature/print')" v-print="printObj" type="primary">
           打印
         </el-button>
       </template>
@@ -214,13 +215,13 @@
         <template #columns>
           <el-table-column label="操作" align="center" width="250">
             <template #default="{ row }">
-              <el-button size="small" type="primary" link @click="edit(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/signature/update')" size="small" type="primary" link @click="edit(row)">
                 编辑
               </el-button>
-              <el-button size="small" type="primary" link @click="detail(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/signature/detail')" size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button size="small" type="danger" link @click="remove(row)">
+              <el-button v-if="proxy.hasPerm('/sys/tool/signature/delete')" size="small" type="danger" link @click="remove(row)">
                 删除
               </el-button>
             </template>