diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }
diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
index 5773128..b4bfa1b 100644
--- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
@@ -4,9 +4,11 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import pdfFile from './pdfFile.vue'
 import { printPdf } from '@/utils/printUtils'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { exportFile, printContent } from '@/utils/exportUtils'
+import { getFiles } from '@/utils/download'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -62,29 +64,52 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: $route.query.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    printPdf(res.data)
-    // exportFile(res.data, '123.pdf')
+// const print = () => {
+//   printPage({ id: $route.query.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     printPdf(res.data)
+//     // exportFile(res.data, '123.pdf')
+//   })
+// }
+// 打印
+// const printObj = ref({
+//   id: 'form', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
 // 打印
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`检测结果复查通知单-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -96,13 +121,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -118,7 +143,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }
diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
index 5773128..b4bfa1b 100644
--- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
@@ -4,9 +4,11 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import pdfFile from './pdfFile.vue'
 import { printPdf } from '@/utils/printUtils'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { exportFile, printContent } from '@/utils/exportUtils'
+import { getFiles } from '@/utils/download'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -62,29 +64,52 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: $route.query.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    printPdf(res.data)
-    // exportFile(res.data, '123.pdf')
+// const print = () => {
+//   printPage({ id: $route.query.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     printPdf(res.data)
+//     // exportFile(res.data, '123.pdf')
+//   })
+// }
+// 打印
+// const printObj = ref({
+//   id: 'form', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
 // 打印
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`检测结果复查通知单-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -96,13 +121,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -118,7 +143,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
new file mode 100644
index 0000000..1de13fb
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
@@ -0,0 +1,46 @@
+<!-- 文件预览组件 -->
+<script lang="ts" setup name="FilePreview">
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
+import { getBase64, getObjectURL } from '@/utils/download'
+const emit = defineEmits(['getFile'])
+
+const pdfUrl = ref('')
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  emit('getFile', (res: any) => {
+    if (res) {
+      getBase64(res.data).then((res) => {
+        pdfUrl.value = res as string
+      })
+      pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+      loading.close()
+    }
+    else {
+      loading.close()
+    }
+  })
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <!-- pdf预览 -->
+  <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }
diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
index 5773128..b4bfa1b 100644
--- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
@@ -4,9 +4,11 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import pdfFile from './pdfFile.vue'
 import { printPdf } from '@/utils/printUtils'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { exportFile, printContent } from '@/utils/exportUtils'
+import { getFiles } from '@/utils/download'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -62,29 +64,52 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: $route.query.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    printPdf(res.data)
-    // exportFile(res.data, '123.pdf')
+// const print = () => {
+//   printPage({ id: $route.query.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     printPdf(res.data)
+//     // exportFile(res.data, '123.pdf')
+//   })
+// }
+// 打印
+// const printObj = ref({
+//   id: 'form', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
 // 打印
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`检测结果复查通知单-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -96,13 +121,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -118,7 +143,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
new file mode 100644
index 0000000..1de13fb
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
@@ -0,0 +1,46 @@
+<!-- 文件预览组件 -->
+<script lang="ts" setup name="FilePreview">
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
+import { getBase64, getObjectURL } from '@/utils/download'
+const emit = defineEmits(['getFile'])
+
+const pdfUrl = ref('')
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  emit('getFile', (res: any) => {
+    if (res) {
+      getBase64(res.data).then((res) => {
+        pdfUrl.value = res as string
+      })
+      pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+      loading.close()
+    }
+    else {
+      loading.close()
+    }
+  })
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <!-- pdf预览 -->
+  <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5af6c7f..ffc8b7c 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -6,44 +6,45 @@
 import { printJSON } from '@/utils/printUtils'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
+  noticeDateEnd: '',
+  noticeDateStart: '',
+  // createUserName: '',
   noticeNo: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeDateEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.noticeDateStart = `${newVal[0]} 00:00:00`
+      listQuery.noticeDateEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
 const columns = ref([
   {
-    text: '通知单编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知单名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
+    text: '通知时间',
+    value: 'noticeDate',
     align: 'center',
   },
 ])
@@ -64,7 +65,7 @@
     listLoading.value = false
   })
 }
-fetchData()
+// fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -73,9 +74,10 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.createUserName = ''
+  listQuery.noticeDateEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeName = ''
+  // listQuery.createUserName = ''
   listQuery.noticeNo = ''
   listQuery.offset = 1
   listQuery.limit = 20
@@ -127,12 +129,12 @@
         <el-input v-model.trim="listQuery.noticeNo" placeholder="通知单编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }
diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
index 5773128..b4bfa1b 100644
--- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
@@ -4,9 +4,11 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import pdfFile from './pdfFile.vue'
 import { printPdf } from '@/utils/printUtils'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { exportFile, printContent } from '@/utils/exportUtils'
+import { getFiles } from '@/utils/download'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -62,29 +64,52 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: $route.query.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    printPdf(res.data)
-    // exportFile(res.data, '123.pdf')
+// const print = () => {
+//   printPage({ id: $route.query.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     printPdf(res.data)
+//     // exportFile(res.data, '123.pdf')
+//   })
+// }
+// 打印
+// const printObj = ref({
+//   id: 'form', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
 // 打印
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`检测结果复查通知单-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -96,13 +121,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -118,7 +143,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
new file mode 100644
index 0000000..1de13fb
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
@@ -0,0 +1,46 @@
+<!-- 文件预览组件 -->
+<script lang="ts" setup name="FilePreview">
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
+import { getBase64, getObjectURL } from '@/utils/download'
+const emit = defineEmits(['getFile'])
+
+const pdfUrl = ref('')
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  emit('getFile', (res: any) => {
+    if (res) {
+      getBase64(res.data).then((res) => {
+        pdfUrl.value = res as string
+      })
+      pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+      loading.close()
+    }
+    else {
+      loading.close()
+    }
+  })
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <!-- pdf预览 -->
+  <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5af6c7f..ffc8b7c 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -6,44 +6,45 @@
 import { printJSON } from '@/utils/printUtils'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
+  noticeDateEnd: '',
+  noticeDateStart: '',
+  // createUserName: '',
   noticeNo: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeDateEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.noticeDateStart = `${newVal[0]} 00:00:00`
+      listQuery.noticeDateEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
 const columns = ref([
   {
-    text: '通知单编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知单名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
+    text: '通知时间',
+    value: 'noticeDate',
     align: 'center',
   },
 ])
@@ -64,7 +65,7 @@
     listLoading.value = false
   })
 }
-fetchData()
+// fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -73,9 +74,10 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.createUserName = ''
+  listQuery.noticeDateEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeName = ''
+  // listQuery.createUserName = ''
   listQuery.noticeNo = ''
   listQuery.offset = 1
   listQuery.limit = 20
@@ -127,12 +129,12 @@
         <el-input v-model.trim="listQuery.noticeNo" placeholder="通知单编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/notice/components/detail.vue b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
index 3e286cf..51b35cf 100644
--- a/src/views/tested/MeasurementBusiness/notice/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
@@ -6,9 +6,11 @@
 // import * as pdfjsLib from 'pdfjs-dist'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import { getFiles } from '@/utils/download'
 import { printContent } from '@/utils/exportUtils'
 import { getPageDetail, printPage } from '@/api/eqpt/MeasurementBusiness/notice'
 import { printPdf } from '@/utils/printUtils'
+import pdfFile from '@/views/tested/MeasurementBusiness/detection/components/pdfFile.vue'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -72,28 +74,51 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    // printContent(res.data)
-    printPdf(res.data)
+// const print = () => {
+//   printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     // printContent(res.data)
+//     printPdf(res.data)
+//   })
+// }
+// const printObj = ref({
+//   id: 'print-page', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
-const printObj = ref({
-  id: 'print-page', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`测试、校准或检定工作分包通知书-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -105,13 +130,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -122,7 +147,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }
diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
index 5773128..b4bfa1b 100644
--- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
@@ -4,9 +4,11 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import pdfFile from './pdfFile.vue'
 import { printPdf } from '@/utils/printUtils'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { exportFile, printContent } from '@/utils/exportUtils'
+import { getFiles } from '@/utils/download'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -62,29 +64,52 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: $route.query.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    printPdf(res.data)
-    // exportFile(res.data, '123.pdf')
+// const print = () => {
+//   printPage({ id: $route.query.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     printPdf(res.data)
+//     // exportFile(res.data, '123.pdf')
+//   })
+// }
+// 打印
+// const printObj = ref({
+//   id: 'form', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
 // 打印
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`检测结果复查通知单-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -96,13 +121,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -118,7 +143,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
new file mode 100644
index 0000000..1de13fb
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
@@ -0,0 +1,46 @@
+<!-- 文件预览组件 -->
+<script lang="ts" setup name="FilePreview">
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
+import { getBase64, getObjectURL } from '@/utils/download'
+const emit = defineEmits(['getFile'])
+
+const pdfUrl = ref('')
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  emit('getFile', (res: any) => {
+    if (res) {
+      getBase64(res.data).then((res) => {
+        pdfUrl.value = res as string
+      })
+      pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+      loading.close()
+    }
+    else {
+      loading.close()
+    }
+  })
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <!-- pdf预览 -->
+  <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5af6c7f..ffc8b7c 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -6,44 +6,45 @@
 import { printJSON } from '@/utils/printUtils'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
+  noticeDateEnd: '',
+  noticeDateStart: '',
+  // createUserName: '',
   noticeNo: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeDateEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.noticeDateStart = `${newVal[0]} 00:00:00`
+      listQuery.noticeDateEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
 const columns = ref([
   {
-    text: '通知单编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知单名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
+    text: '通知时间',
+    value: 'noticeDate',
     align: 'center',
   },
 ])
@@ -64,7 +65,7 @@
     listLoading.value = false
   })
 }
-fetchData()
+// fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -73,9 +74,10 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.createUserName = ''
+  listQuery.noticeDateEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeName = ''
+  // listQuery.createUserName = ''
   listQuery.noticeNo = ''
   listQuery.offset = 1
   listQuery.limit = 20
@@ -127,12 +129,12 @@
         <el-input v-model.trim="listQuery.noticeNo" placeholder="通知单编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/notice/components/detail.vue b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
index 3e286cf..51b35cf 100644
--- a/src/views/tested/MeasurementBusiness/notice/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
@@ -6,9 +6,11 @@
 // import * as pdfjsLib from 'pdfjs-dist'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import { getFiles } from '@/utils/download'
 import { printContent } from '@/utils/exportUtils'
 import { getPageDetail, printPage } from '@/api/eqpt/MeasurementBusiness/notice'
 import { printPdf } from '@/utils/printUtils'
+import pdfFile from '@/views/tested/MeasurementBusiness/detection/components/pdfFile.vue'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -72,28 +74,51 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    // printContent(res.data)
-    printPdf(res.data)
+// const print = () => {
+//   printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     // printContent(res.data)
+//     printPdf(res.data)
+//   })
+// }
+// const printObj = ref({
+//   id: 'print-page', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
-const printObj = ref({
-  id: 'print-page', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`测试、校准或检定工作分包通知书-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -105,13 +130,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -122,7 +147,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 2d74eac..abf2930 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -12,7 +12,9 @@
   customerName: '',
   formId: '',
   noticeNo: '',
+  outsourceItem: '',
   outsourcerName: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
@@ -30,17 +32,17 @@
 })
 const columns = ref([
   {
-    text: '通知书编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知书名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
   {
-    text: '受检单位名称',
+    text: '委托单位',
     value: 'customerName',
     align: 'center',
   },
@@ -50,10 +52,15 @@
     align: 'center',
   },
   {
-    text: '申请人',
-    value: 'createUserName',
+    text: '分包项目',
+    value: 'outsourceItem',
     align: 'center',
   },
+  // {
+  //   text: '申请人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
 
   {
     text: '申请时间',
@@ -91,6 +98,8 @@
   listQuery.applicantTimeStart = ''
   listQuery.approvalStatus = ''
   listQuery.customerName = ''
+  listQuery.outsourceItem = ''
+  listQuery.noticeName = ''
   listQuery.formId = ''
   listQuery.noticeNo = ''
   listQuery.outsourcerName = ''
@@ -126,21 +135,27 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.noticeNo" placeholder="通知书编号" clearable />
+        <el-input v-model.trim="listQuery.noticeNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.customerName" placeholder="受检单位名称" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.customerName" placeholder="委托单位" clearable />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+        <el-input v-model.trim="listQuery.outsourceItem" placeholder="分包项目" clearable />
       </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+      </search-item> -->
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }
diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
index 5773128..b4bfa1b 100644
--- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
@@ -4,9 +4,11 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import pdfFile from './pdfFile.vue'
 import { printPdf } from '@/utils/printUtils'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { exportFile, printContent } from '@/utils/exportUtils'
+import { getFiles } from '@/utils/download'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -62,29 +64,52 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: $route.query.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    printPdf(res.data)
-    // exportFile(res.data, '123.pdf')
+// const print = () => {
+//   printPage({ id: $route.query.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     printPdf(res.data)
+//     // exportFile(res.data, '123.pdf')
+//   })
+// }
+// 打印
+// const printObj = ref({
+//   id: 'form', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
 // 打印
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`检测结果复查通知单-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -96,13 +121,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -118,7 +143,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
new file mode 100644
index 0000000..1de13fb
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
@@ -0,0 +1,46 @@
+<!-- 文件预览组件 -->
+<script lang="ts" setup name="FilePreview">
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
+import { getBase64, getObjectURL } from '@/utils/download'
+const emit = defineEmits(['getFile'])
+
+const pdfUrl = ref('')
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  emit('getFile', (res: any) => {
+    if (res) {
+      getBase64(res.data).then((res) => {
+        pdfUrl.value = res as string
+      })
+      pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+      loading.close()
+    }
+    else {
+      loading.close()
+    }
+  })
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <!-- pdf预览 -->
+  <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5af6c7f..ffc8b7c 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -6,44 +6,45 @@
 import { printJSON } from '@/utils/printUtils'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
+  noticeDateEnd: '',
+  noticeDateStart: '',
+  // createUserName: '',
   noticeNo: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeDateEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.noticeDateStart = `${newVal[0]} 00:00:00`
+      listQuery.noticeDateEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
 const columns = ref([
   {
-    text: '通知单编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知单名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
+    text: '通知时间',
+    value: 'noticeDate',
     align: 'center',
   },
 ])
@@ -64,7 +65,7 @@
     listLoading.value = false
   })
 }
-fetchData()
+// fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -73,9 +74,10 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.createUserName = ''
+  listQuery.noticeDateEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeName = ''
+  // listQuery.createUserName = ''
   listQuery.noticeNo = ''
   listQuery.offset = 1
   listQuery.limit = 20
@@ -127,12 +129,12 @@
         <el-input v-model.trim="listQuery.noticeNo" placeholder="通知单编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/notice/components/detail.vue b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
index 3e286cf..51b35cf 100644
--- a/src/views/tested/MeasurementBusiness/notice/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
@@ -6,9 +6,11 @@
 // import * as pdfjsLib from 'pdfjs-dist'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import { getFiles } from '@/utils/download'
 import { printContent } from '@/utils/exportUtils'
 import { getPageDetail, printPage } from '@/api/eqpt/MeasurementBusiness/notice'
 import { printPdf } from '@/utils/printUtils'
+import pdfFile from '@/views/tested/MeasurementBusiness/detection/components/pdfFile.vue'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -72,28 +74,51 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    // printContent(res.data)
-    printPdf(res.data)
+// const print = () => {
+//   printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     // printContent(res.data)
+//     printPdf(res.data)
+//   })
+// }
+// const printObj = ref({
+//   id: 'print-page', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
-const printObj = ref({
-  id: 'print-page', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`测试、校准或检定工作分包通知书-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -105,13 +130,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -122,7 +147,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 2d74eac..abf2930 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -12,7 +12,9 @@
   customerName: '',
   formId: '',
   noticeNo: '',
+  outsourceItem: '',
   outsourcerName: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
@@ -30,17 +32,17 @@
 })
 const columns = ref([
   {
-    text: '通知书编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知书名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
   {
-    text: '受检单位名称',
+    text: '委托单位',
     value: 'customerName',
     align: 'center',
   },
@@ -50,10 +52,15 @@
     align: 'center',
   },
   {
-    text: '申请人',
-    value: 'createUserName',
+    text: '分包项目',
+    value: 'outsourceItem',
     align: 'center',
   },
+  // {
+  //   text: '申请人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
 
   {
     text: '申请时间',
@@ -91,6 +98,8 @@
   listQuery.applicantTimeStart = ''
   listQuery.approvalStatus = ''
   listQuery.customerName = ''
+  listQuery.outsourceItem = ''
+  listQuery.noticeName = ''
   listQuery.formId = ''
   listQuery.noticeNo = ''
   listQuery.outsourcerName = ''
@@ -126,21 +135,27 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.noticeNo" placeholder="通知书编号" clearable />
+        <el-input v-model.trim="listQuery.noticeNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.customerName" placeholder="受检单位名称" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.customerName" placeholder="委托单位" clearable />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+        <el-input v-model.trim="listQuery.outsourceItem" placeholder="分包项目" clearable />
       </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+      </search-item> -->
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
new file mode 100644
index 0000000..8f76d0b
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { handlerApproval } from '@/api/eqpt/MeasurementBusiness/opinion'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  // comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
+  formData.type = type
+  formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type) {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="90px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <!-- <el-radio label="reject" size="large">
+                驳回
+              </el-radio> -->
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }
diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
index 5773128..b4bfa1b 100644
--- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
@@ -4,9 +4,11 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import pdfFile from './pdfFile.vue'
 import { printPdf } from '@/utils/printUtils'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { exportFile, printContent } from '@/utils/exportUtils'
+import { getFiles } from '@/utils/download'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -62,29 +64,52 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: $route.query.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    printPdf(res.data)
-    // exportFile(res.data, '123.pdf')
+// const print = () => {
+//   printPage({ id: $route.query.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     printPdf(res.data)
+//     // exportFile(res.data, '123.pdf')
+//   })
+// }
+// 打印
+// const printObj = ref({
+//   id: 'form', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
 // 打印
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`检测结果复查通知单-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -96,13 +121,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -118,7 +143,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
new file mode 100644
index 0000000..1de13fb
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
@@ -0,0 +1,46 @@
+<!-- 文件预览组件 -->
+<script lang="ts" setup name="FilePreview">
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
+import { getBase64, getObjectURL } from '@/utils/download'
+const emit = defineEmits(['getFile'])
+
+const pdfUrl = ref('')
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  emit('getFile', (res: any) => {
+    if (res) {
+      getBase64(res.data).then((res) => {
+        pdfUrl.value = res as string
+      })
+      pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+      loading.close()
+    }
+    else {
+      loading.close()
+    }
+  })
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <!-- pdf预览 -->
+  <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5af6c7f..ffc8b7c 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -6,44 +6,45 @@
 import { printJSON } from '@/utils/printUtils'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
+  noticeDateEnd: '',
+  noticeDateStart: '',
+  // createUserName: '',
   noticeNo: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeDateEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.noticeDateStart = `${newVal[0]} 00:00:00`
+      listQuery.noticeDateEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
 const columns = ref([
   {
-    text: '通知单编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知单名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
+    text: '通知时间',
+    value: 'noticeDate',
     align: 'center',
   },
 ])
@@ -64,7 +65,7 @@
     listLoading.value = false
   })
 }
-fetchData()
+// fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -73,9 +74,10 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.createUserName = ''
+  listQuery.noticeDateEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeName = ''
+  // listQuery.createUserName = ''
   listQuery.noticeNo = ''
   listQuery.offset = 1
   listQuery.limit = 20
@@ -127,12 +129,12 @@
         <el-input v-model.trim="listQuery.noticeNo" placeholder="通知单编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/notice/components/detail.vue b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
index 3e286cf..51b35cf 100644
--- a/src/views/tested/MeasurementBusiness/notice/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
@@ -6,9 +6,11 @@
 // import * as pdfjsLib from 'pdfjs-dist'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import { getFiles } from '@/utils/download'
 import { printContent } from '@/utils/exportUtils'
 import { getPageDetail, printPage } from '@/api/eqpt/MeasurementBusiness/notice'
 import { printPdf } from '@/utils/printUtils'
+import pdfFile from '@/views/tested/MeasurementBusiness/detection/components/pdfFile.vue'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -72,28 +74,51 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    // printContent(res.data)
-    printPdf(res.data)
+// const print = () => {
+//   printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     // printContent(res.data)
+//     printPdf(res.data)
+//   })
+// }
+// const printObj = ref({
+//   id: 'print-page', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
-const printObj = ref({
-  id: 'print-page', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`测试、校准或检定工作分包通知书-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -105,13 +130,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -122,7 +147,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 2d74eac..abf2930 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -12,7 +12,9 @@
   customerName: '',
   formId: '',
   noticeNo: '',
+  outsourceItem: '',
   outsourcerName: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
@@ -30,17 +32,17 @@
 })
 const columns = ref([
   {
-    text: '通知书编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知书名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
   {
-    text: '受检单位名称',
+    text: '委托单位',
     value: 'customerName',
     align: 'center',
   },
@@ -50,10 +52,15 @@
     align: 'center',
   },
   {
-    text: '申请人',
-    value: 'createUserName',
+    text: '分包项目',
+    value: 'outsourceItem',
     align: 'center',
   },
+  // {
+  //   text: '申请人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
 
   {
     text: '申请时间',
@@ -91,6 +98,8 @@
   listQuery.applicantTimeStart = ''
   listQuery.approvalStatus = ''
   listQuery.customerName = ''
+  listQuery.outsourceItem = ''
+  listQuery.noticeName = ''
   listQuery.formId = ''
   listQuery.noticeNo = ''
   listQuery.outsourcerName = ''
@@ -126,21 +135,27 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.noticeNo" placeholder="通知书编号" clearable />
+        <el-input v-model.trim="listQuery.noticeNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.customerName" placeholder="受检单位名称" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.customerName" placeholder="委托单位" clearable />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+        <el-input v-model.trim="listQuery.outsourceItem" placeholder="分包项目" clearable />
       </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+      </search-item> -->
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
new file mode 100644
index 0000000..8f76d0b
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { handlerApproval } from '@/api/eqpt/MeasurementBusiness/opinion'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  // comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
+  formData.type = type
+  formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type) {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="90px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <!-- <el-radio label="reject" size="large">
+                驳回
+              </el-radio> -->
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
index a438c2a..bb2b778 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
@@ -3,14 +3,19 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import ApprovalDialog from './ApprovalDialog.vue'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
 import { getUserDept } from '@/api/system/user'
-import { addOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { addOpinion, cancelOpinion, delOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { delTextBtn, editBtn, submitBtn } from '@/utils/applyBtns'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
 const tableRef = ref()
+const statusName = $route.query.statusName as string
 // 显示标题
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -44,6 +49,8 @@
 }) // 表单
 const rules = ref<FormRules>({
   appealUserName: [{ required: true, message: '申诉人', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
+  formName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -53,8 +60,8 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
-  if ($route.params.type === 'update' || $route.params.type === 'create') {
-    ruleForm.value.formName = '委托方意见登记表'
+  if ($route.params.type === 'create') {
+    ruleForm.value.formName = ''
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
@@ -83,104 +90,269 @@
   })
 }
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      if (!ruleForm.value.suggestContent) {
-        ElMessage.warning('请先填写意见内容')
-        return
-      }
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-        update()
-      })
-    }
-  })
-}
+// const saveForm = async (formEl: FormInstance | undefined) => {
+//   if (!formEl) { return }
+//   await formEl.validate((valid, fields) => {
+//     if (valid) {
+//       if (!ruleForm.value.suggestContent) {
+//         ElMessage.warning('请先填写意见内容')
+//         return
+//       }
+//       ElMessageBox.confirm(
+//         '确认保存吗？',
+//         '提示',
+//         {
+//           confirmButtonText: '确认',
+//           cancelButtonText: '取消',
+//           type: 'warning',
+//         },
+//       ).then((res) => {
+//         update()
+//       })
+//     }
+//   })
+// }
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
 }
+const { proxy } = getCurrentInstance() as any
+const permUrl = ref({
+  agree: '/tested/pmetering/plan/agree',
+  reject: '/tested/pmetering/plan/reject',
+})
+// 审批
+const approvalDialogRef = ref()
+const apply = (type: string) => {
+  const data = JSON.parse($route.query.row as string)
+  approvalDialogRef.value.initDialog(type, data.taskId, data.processId, ruleForm.value.id)
+}
+// 编辑
+const editForm = () => {
+  $router.push({
+    params: { ...$route.params, type: 'update' },
+    query: { ...$route.query },
+  })
+}
+// 保存
+const submitId = ref('')
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, _fields) => {
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then((_res) => {
+      if (submitId.value) {
+        ruleForm.value.id = submitId.value
+      }
+      addOpinion(ruleForm.value).then((res) => {
+        submitId.value = res.data
+        // close()
+        if (statusName === '已取消' || statusName === '未通过') {
+          submitOpinion({ id: submitId.value, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((res) => {
+            ElMessage.success('已提交')
+            close()
+          })
+        }
+        else {
+          ElMessage.success('保存成功')
+        }
+      })
+    })
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((_res) => {
+    submitOpinion({ id: submitId.value, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((_res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 删除
+const delForm = () => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+    })
+  })
+}
+// 取消
+const cancelForm = () => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    cancelOpinion({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      // close()
+      close()
+    })
+  })
+}
+// 详情
+const processId = ref()
+// detailPlan(data.id).then((res) => {
+//   processId.value = res.data.processId
+//   console.log(processId.value, 'processId.value')
+// })
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+const activeName = ref('基本信息')
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`委托方意见登记表-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.agree) " type="primary" @click="apply('agree')">
+          同意
+        </el-button>
+        <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.reject)" type="primary" @click="apply('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
+          编辑
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
+          提交
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
+        <el-button v-if="delTextBtn(statusName)" type="info" @click="delForm()">
+          删除
+        </el-button>
+        <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
+          取消
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="表单编号" prop="formNo">
-              <el-input v-model.trim="ruleForm.formNo" placeholder="系统自动生成" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="表单名称" prop="formName">
-              <el-input v-model.trim="ruleForm.formName" placeholder="表单名称" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="单位" props="senderName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="单位" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门">
-              <el-input v-model.trim="ruleForm.customerDeptName" placeholder="部门" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="申诉人" prop="appealUserName">
-              <el-input v-model.trim="ruleForm.appealUserName" placeholder="申诉人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建人" prop="createUserName">
-              <el-input v-model.trim="ruleForm.createUserName" placeholder="创建人" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间" prop="createTime">
-              <el-input v-model.trim="ruleForm.createTime" placeholder="创建时间" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+    <detail-block-com v-if="statusName !== '草稿箱' && $route.path.includes('detail')">
+      <el-radio-group v-model="activeName">
+        <el-radio-button label="基本信息">
+          基本信息
+        </el-radio-button>
+        <el-radio-button label="审批详情">
+          审批详情
+        </el-radio-button>
+      </el-radio-group>
     </detail-block-com>
-    <detail-block-com>
-      <detail-block-switch title="意见内容">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="1" />
-          <el-col :span="22">
-            <el-input
-              v-model.trim="ruleForm.suggestContent" :rows="4" :disabled="$route.path.includes('detail')"
-              type="textarea" placeholder="意见内容"
-            />
-          </el-col>
-          <el-col :span="1" />
-        </el-row>
-      </detail-block-switch>
-    </detail-block-com>
+    <template v-if="activeName === '基本信息'">
+      <detail-block-com>
+        <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="文件编号" prop="formNo">
+                <el-input v-model.trim="ruleForm.formNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标题" prop="formName">
+                <el-input v-model.trim="ruleForm.formName" placeholder="标题" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="单位" props="senderName">
+                <el-input v-model.trim="ruleForm.customerName" placeholder="单位" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="部门">
+                <el-input v-model.trim="ruleForm.customerDeptName" placeholder="部门" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="申诉人" prop="appealUserName">
+                <el-input v-model.trim="ruleForm.appealUserName" placeholder="申诉人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建人" prop="createUserName">
+                <el-input v-model.trim="ruleForm.createUserName" placeholder="创建人" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间" prop="createTime">
+                <el-input v-model.trim="ruleForm.createTime" placeholder="创建时间" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实验室代码" prop="labCode">
+                <!-- <el-input v-model.trim="ruleForm.labCode" placeholder="创建时间" disabled /> -->
+                <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                  <el-option
+                    v-for="item in labCodeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <detail-block-switch title="意见内容">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="1" />
+            <el-col :span="22">
+              <el-input
+                v-model.trim="ruleForm.suggestContent" :rows="4" :disabled="$route.path.includes('detail')"
+                type="textarea" placeholder="意见内容"
+              />
+            </el-col>
+            <el-col :span="1" />
+          </el-row>
+        </detail-block-switch>
+      </detail-block-com>
+    </template>
+    <approval-record-table v-if="activeName === '审批详情'" :process-id="ruleForm.processId" />
   </app-container>
 </template>
 

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }
diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
index 5773128..b4bfa1b 100644
--- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
@@ -4,9 +4,11 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import pdfFile from './pdfFile.vue'
 import { printPdf } from '@/utils/printUtils'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { exportFile, printContent } from '@/utils/exportUtils'
+import { getFiles } from '@/utils/download'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -62,29 +64,52 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: $route.query.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    printPdf(res.data)
-    // exportFile(res.data, '123.pdf')
+// const print = () => {
+//   printPage({ id: $route.query.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     printPdf(res.data)
+//     // exportFile(res.data, '123.pdf')
+//   })
+// }
+// 打印
+// const printObj = ref({
+//   id: 'form', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
 // 打印
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`检测结果复查通知单-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -96,13 +121,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -118,7 +143,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
new file mode 100644
index 0000000..1de13fb
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
@@ -0,0 +1,46 @@
+<!-- 文件预览组件 -->
+<script lang="ts" setup name="FilePreview">
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
+import { getBase64, getObjectURL } from '@/utils/download'
+const emit = defineEmits(['getFile'])
+
+const pdfUrl = ref('')
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  emit('getFile', (res: any) => {
+    if (res) {
+      getBase64(res.data).then((res) => {
+        pdfUrl.value = res as string
+      })
+      pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+      loading.close()
+    }
+    else {
+      loading.close()
+    }
+  })
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <!-- pdf预览 -->
+  <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5af6c7f..ffc8b7c 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -6,44 +6,45 @@
 import { printJSON } from '@/utils/printUtils'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
+  noticeDateEnd: '',
+  noticeDateStart: '',
+  // createUserName: '',
   noticeNo: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeDateEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.noticeDateStart = `${newVal[0]} 00:00:00`
+      listQuery.noticeDateEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
 const columns = ref([
   {
-    text: '通知单编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知单名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
+    text: '通知时间',
+    value: 'noticeDate',
     align: 'center',
   },
 ])
@@ -64,7 +65,7 @@
     listLoading.value = false
   })
 }
-fetchData()
+// fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -73,9 +74,10 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.createUserName = ''
+  listQuery.noticeDateEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeName = ''
+  // listQuery.createUserName = ''
   listQuery.noticeNo = ''
   listQuery.offset = 1
   listQuery.limit = 20
@@ -127,12 +129,12 @@
         <el-input v-model.trim="listQuery.noticeNo" placeholder="通知单编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/notice/components/detail.vue b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
index 3e286cf..51b35cf 100644
--- a/src/views/tested/MeasurementBusiness/notice/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
@@ -6,9 +6,11 @@
 // import * as pdfjsLib from 'pdfjs-dist'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import { getFiles } from '@/utils/download'
 import { printContent } from '@/utils/exportUtils'
 import { getPageDetail, printPage } from '@/api/eqpt/MeasurementBusiness/notice'
 import { printPdf } from '@/utils/printUtils'
+import pdfFile from '@/views/tested/MeasurementBusiness/detection/components/pdfFile.vue'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -72,28 +74,51 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    // printContent(res.data)
-    printPdf(res.data)
+// const print = () => {
+//   printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     // printContent(res.data)
+//     printPdf(res.data)
+//   })
+// }
+// const printObj = ref({
+//   id: 'print-page', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
-const printObj = ref({
-  id: 'print-page', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`测试、校准或检定工作分包通知书-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -105,13 +130,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -122,7 +147,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 2d74eac..abf2930 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -12,7 +12,9 @@
   customerName: '',
   formId: '',
   noticeNo: '',
+  outsourceItem: '',
   outsourcerName: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
@@ -30,17 +32,17 @@
 })
 const columns = ref([
   {
-    text: '通知书编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知书名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
   {
-    text: '受检单位名称',
+    text: '委托单位',
     value: 'customerName',
     align: 'center',
   },
@@ -50,10 +52,15 @@
     align: 'center',
   },
   {
-    text: '申请人',
-    value: 'createUserName',
+    text: '分包项目',
+    value: 'outsourceItem',
     align: 'center',
   },
+  // {
+  //   text: '申请人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
 
   {
     text: '申请时间',
@@ -91,6 +98,8 @@
   listQuery.applicantTimeStart = ''
   listQuery.approvalStatus = ''
   listQuery.customerName = ''
+  listQuery.outsourceItem = ''
+  listQuery.noticeName = ''
   listQuery.formId = ''
   listQuery.noticeNo = ''
   listQuery.outsourcerName = ''
@@ -126,21 +135,27 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.noticeNo" placeholder="通知书编号" clearable />
+        <el-input v-model.trim="listQuery.noticeNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.customerName" placeholder="受检单位名称" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.customerName" placeholder="委托单位" clearable />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+        <el-input v-model.trim="listQuery.outsourceItem" placeholder="分包项目" clearable />
       </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+      </search-item> -->
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
new file mode 100644
index 0000000..8f76d0b
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { handlerApproval } from '@/api/eqpt/MeasurementBusiness/opinion'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  // comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
+  formData.type = type
+  formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type) {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="90px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <!-- <el-radio label="reject" size="large">
+                驳回
+              </el-radio> -->
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
index a438c2a..bb2b778 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
@@ -3,14 +3,19 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import ApprovalDialog from './ApprovalDialog.vue'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
 import { getUserDept } from '@/api/system/user'
-import { addOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { addOpinion, cancelOpinion, delOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { delTextBtn, editBtn, submitBtn } from '@/utils/applyBtns'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
 const tableRef = ref()
+const statusName = $route.query.statusName as string
 // 显示标题
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -44,6 +49,8 @@
 }) // 表单
 const rules = ref<FormRules>({
   appealUserName: [{ required: true, message: '申诉人', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
+  formName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -53,8 +60,8 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
-  if ($route.params.type === 'update' || $route.params.type === 'create') {
-    ruleForm.value.formName = '委托方意见登记表'
+  if ($route.params.type === 'create') {
+    ruleForm.value.formName = ''
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
@@ -83,104 +90,269 @@
   })
 }
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      if (!ruleForm.value.suggestContent) {
-        ElMessage.warning('请先填写意见内容')
-        return
-      }
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-        update()
-      })
-    }
-  })
-}
+// const saveForm = async (formEl: FormInstance | undefined) => {
+//   if (!formEl) { return }
+//   await formEl.validate((valid, fields) => {
+//     if (valid) {
+//       if (!ruleForm.value.suggestContent) {
+//         ElMessage.warning('请先填写意见内容')
+//         return
+//       }
+//       ElMessageBox.confirm(
+//         '确认保存吗？',
+//         '提示',
+//         {
+//           confirmButtonText: '确认',
+//           cancelButtonText: '取消',
+//           type: 'warning',
+//         },
+//       ).then((res) => {
+//         update()
+//       })
+//     }
+//   })
+// }
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
 }
+const { proxy } = getCurrentInstance() as any
+const permUrl = ref({
+  agree: '/tested/pmetering/plan/agree',
+  reject: '/tested/pmetering/plan/reject',
+})
+// 审批
+const approvalDialogRef = ref()
+const apply = (type: string) => {
+  const data = JSON.parse($route.query.row as string)
+  approvalDialogRef.value.initDialog(type, data.taskId, data.processId, ruleForm.value.id)
+}
+// 编辑
+const editForm = () => {
+  $router.push({
+    params: { ...$route.params, type: 'update' },
+    query: { ...$route.query },
+  })
+}
+// 保存
+const submitId = ref('')
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, _fields) => {
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then((_res) => {
+      if (submitId.value) {
+        ruleForm.value.id = submitId.value
+      }
+      addOpinion(ruleForm.value).then((res) => {
+        submitId.value = res.data
+        // close()
+        if (statusName === '已取消' || statusName === '未通过') {
+          submitOpinion({ id: submitId.value, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((res) => {
+            ElMessage.success('已提交')
+            close()
+          })
+        }
+        else {
+          ElMessage.success('保存成功')
+        }
+      })
+    })
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((_res) => {
+    submitOpinion({ id: submitId.value, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((_res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 删除
+const delForm = () => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+    })
+  })
+}
+// 取消
+const cancelForm = () => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    cancelOpinion({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      // close()
+      close()
+    })
+  })
+}
+// 详情
+const processId = ref()
+// detailPlan(data.id).then((res) => {
+//   processId.value = res.data.processId
+//   console.log(processId.value, 'processId.value')
+// })
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+const activeName = ref('基本信息')
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`委托方意见登记表-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.agree) " type="primary" @click="apply('agree')">
+          同意
+        </el-button>
+        <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.reject)" type="primary" @click="apply('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
+          编辑
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
+          提交
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
+        <el-button v-if="delTextBtn(statusName)" type="info" @click="delForm()">
+          删除
+        </el-button>
+        <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
+          取消
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="表单编号" prop="formNo">
-              <el-input v-model.trim="ruleForm.formNo" placeholder="系统自动生成" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="表单名称" prop="formName">
-              <el-input v-model.trim="ruleForm.formName" placeholder="表单名称" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="单位" props="senderName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="单位" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门">
-              <el-input v-model.trim="ruleForm.customerDeptName" placeholder="部门" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="申诉人" prop="appealUserName">
-              <el-input v-model.trim="ruleForm.appealUserName" placeholder="申诉人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建人" prop="createUserName">
-              <el-input v-model.trim="ruleForm.createUserName" placeholder="创建人" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间" prop="createTime">
-              <el-input v-model.trim="ruleForm.createTime" placeholder="创建时间" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+    <detail-block-com v-if="statusName !== '草稿箱' && $route.path.includes('detail')">
+      <el-radio-group v-model="activeName">
+        <el-radio-button label="基本信息">
+          基本信息
+        </el-radio-button>
+        <el-radio-button label="审批详情">
+          审批详情
+        </el-radio-button>
+      </el-radio-group>
     </detail-block-com>
-    <detail-block-com>
-      <detail-block-switch title="意见内容">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="1" />
-          <el-col :span="22">
-            <el-input
-              v-model.trim="ruleForm.suggestContent" :rows="4" :disabled="$route.path.includes('detail')"
-              type="textarea" placeholder="意见内容"
-            />
-          </el-col>
-          <el-col :span="1" />
-        </el-row>
-      </detail-block-switch>
-    </detail-block-com>
+    <template v-if="activeName === '基本信息'">
+      <detail-block-com>
+        <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="文件编号" prop="formNo">
+                <el-input v-model.trim="ruleForm.formNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标题" prop="formName">
+                <el-input v-model.trim="ruleForm.formName" placeholder="标题" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="单位" props="senderName">
+                <el-input v-model.trim="ruleForm.customerName" placeholder="单位" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="部门">
+                <el-input v-model.trim="ruleForm.customerDeptName" placeholder="部门" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="申诉人" prop="appealUserName">
+                <el-input v-model.trim="ruleForm.appealUserName" placeholder="申诉人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建人" prop="createUserName">
+                <el-input v-model.trim="ruleForm.createUserName" placeholder="创建人" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间" prop="createTime">
+                <el-input v-model.trim="ruleForm.createTime" placeholder="创建时间" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实验室代码" prop="labCode">
+                <!-- <el-input v-model.trim="ruleForm.labCode" placeholder="创建时间" disabled /> -->
+                <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                  <el-option
+                    v-for="item in labCodeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <detail-block-switch title="意见内容">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="1" />
+            <el-col :span="22">
+              <el-input
+                v-model.trim="ruleForm.suggestContent" :rows="4" :disabled="$route.path.includes('detail')"
+                type="textarea" placeholder="意见内容"
+              />
+            </el-col>
+            <el-col :span="1" />
+          </el-row>
+        </detail-block-switch>
+      </detail-block-com>
+    </template>
+    <approval-record-table v-if="activeName === '审批详情'" :process-id="ruleForm.processId" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
new file mode 100644
index 0000000..b914ef1
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -0,0 +1,408 @@
+<!-- 委托方意见登记表 -->
+<script lang="ts" setup name="ClientOpinionForm">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import ApprovalDialog from './ApprovalDialog.vue'
+import { cancelOpinion, delOpinion, getListPage, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getDictByCode } from '@/api/system/dict'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+const $props = defineProps({
+  statusName: {
+    type: String,
+    default: '',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const applyDict = ref<{ [key: string]: string }>({
+  审批: '',
+  草稿箱: '1',
+  审批中: '3',
+  已通过: '4',
+  未通过: '5',
+  已取消: '6',
+})
+const listQuery = reactive({
+  approvalStatus: '0',
+  createTimeEnd: '',
+  createTimeStart: '',
+  // createUserName: '',
+  // customerDeptName: '',
+  // customerName: '',
+  customerId: '',
+  customerDeptId: '',
+  handleStatus: '',
+  formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL,
+  formNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 证书有效期开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'formNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'formName',
+    align: 'center',
+  },
+  {
+    text: '单位',
+    value: 'customerName',
+    align: 'center',
+  },
+  {
+    text: '部门',
+    value: 'customerDeptName',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage(listQuery, $props.statusName).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+// 审批状态发生变化
+watch(() => $props.statusName, (newVal) => {
+  if (newVal) {
+    listQuery.handleStatus = ''
+    listQuery.approvalStatus = applyDict.value[newVal] as string
+    fetchData()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.formNo = ''
+  // listQuery.createUserName = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.customerId = ''
+  listQuery.customerDeptId = ''
+  listQuery.handleStatus = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+// const handler = (row: any, type: string) => {
+//   $router.push({
+//     path: `/opinion/${type}`,
+//     query: {
+//       row: JSON.stringify(row),
+//       id: row.id,
+//     },
+//   })
+// }
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitOpinion({ id: row.id, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 取消
+const canHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelOpinion({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      // close()
+      search()
+    })
+  })
+}
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `opinion/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+    },
+  })
+}
+// 详情
+const detail = (row: any) => {
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: 'opinion/detail',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+      },
+    })
+  }
+}
+const permUrl = {
+  add: '/tested/business/opinion/add',
+  edit: '/tested/business/opinion/edit',
+  agree: '/tested/business/opinion/agree',
+  reject: '/tested/business/opinion/reject',
+  submit: '/tested/business/opinion/submit',
+  cancel: '/tested/business/opinion/cancel',
+  del: '/tested/business/opinion/delete',
+}
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 处置情况
+const handleStatusList = ref<{ id: string; value: string; name: string }[]>([])
+// 获取字典
+const fetchDict = () => {
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  // 处置情况
+
+  getDictByCode('eqptHandleStatus').then((res) => {
+    handleStatusList.value = res.data
+  })
+}
+fetchDict()
+// 监听单位，修改部门
+watch(() => listQuery.customerId, (newVal) => {
+  listQuery.customerDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.formNo" placeholder="文件编号" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.customerId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.customerDeptId"
+          style="width: 100%;"
+          :data="deptList"
+          :render-after-expand="false"
+          check-strictly
+          placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
+        />
+      </search-item>
+      <search-item v-if="$props.statusName === '全部'">
+        <el-select v-model="listQuery.handleStatus" clearable placeholder="处置情况">
+          <el-option v-for="item in handleStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template v-if="$props.statusName === '全部'" #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/opinion/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="审核人" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approveUserName }}
+            </template>
+          </el-table-column>
+          <el-table-column v-if="$props.statusName === '全部'" label="处置情况" align="center">
+            <template #default=" scope ">
+              {{ scope.row.handleStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column v-if="$props.statusName !== '全部'" label="审批状态" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="160" align="center">
+            <template #default=" scope ">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="primary" size="small"
+                @click="handler(scope.row, 'update')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del) && $props.statusName !== '全部'" link type="danger" size="small"
+                @click="delHandler(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }
diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
index 5773128..b4bfa1b 100644
--- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
@@ -4,9 +4,11 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import pdfFile from './pdfFile.vue'
 import { printPdf } from '@/utils/printUtils'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { exportFile, printContent } from '@/utils/exportUtils'
+import { getFiles } from '@/utils/download'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -62,29 +64,52 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: $route.query.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    printPdf(res.data)
-    // exportFile(res.data, '123.pdf')
+// const print = () => {
+//   printPage({ id: $route.query.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     printPdf(res.data)
+//     // exportFile(res.data, '123.pdf')
+//   })
+// }
+// 打印
+// const printObj = ref({
+//   id: 'form', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
 // 打印
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`检测结果复查通知单-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -96,13 +121,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -118,7 +143,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
new file mode 100644
index 0000000..1de13fb
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
@@ -0,0 +1,46 @@
+<!-- 文件预览组件 -->
+<script lang="ts" setup name="FilePreview">
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
+import { getBase64, getObjectURL } from '@/utils/download'
+const emit = defineEmits(['getFile'])
+
+const pdfUrl = ref('')
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  emit('getFile', (res: any) => {
+    if (res) {
+      getBase64(res.data).then((res) => {
+        pdfUrl.value = res as string
+      })
+      pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+      loading.close()
+    }
+    else {
+      loading.close()
+    }
+  })
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <!-- pdf预览 -->
+  <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5af6c7f..ffc8b7c 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -6,44 +6,45 @@
 import { printJSON } from '@/utils/printUtils'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
+  noticeDateEnd: '',
+  noticeDateStart: '',
+  // createUserName: '',
   noticeNo: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeDateEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.noticeDateStart = `${newVal[0]} 00:00:00`
+      listQuery.noticeDateEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
 const columns = ref([
   {
-    text: '通知单编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知单名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
+    text: '通知时间',
+    value: 'noticeDate',
     align: 'center',
   },
 ])
@@ -64,7 +65,7 @@
     listLoading.value = false
   })
 }
-fetchData()
+// fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -73,9 +74,10 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.createUserName = ''
+  listQuery.noticeDateEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeName = ''
+  // listQuery.createUserName = ''
   listQuery.noticeNo = ''
   listQuery.offset = 1
   listQuery.limit = 20
@@ -127,12 +129,12 @@
         <el-input v-model.trim="listQuery.noticeNo" placeholder="通知单编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/notice/components/detail.vue b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
index 3e286cf..51b35cf 100644
--- a/src/views/tested/MeasurementBusiness/notice/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
@@ -6,9 +6,11 @@
 // import * as pdfjsLib from 'pdfjs-dist'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import { getFiles } from '@/utils/download'
 import { printContent } from '@/utils/exportUtils'
 import { getPageDetail, printPage } from '@/api/eqpt/MeasurementBusiness/notice'
 import { printPdf } from '@/utils/printUtils'
+import pdfFile from '@/views/tested/MeasurementBusiness/detection/components/pdfFile.vue'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -72,28 +74,51 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    // printContent(res.data)
-    printPdf(res.data)
+// const print = () => {
+//   printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     // printContent(res.data)
+//     printPdf(res.data)
+//   })
+// }
+// const printObj = ref({
+//   id: 'print-page', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
-const printObj = ref({
-  id: 'print-page', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`测试、校准或检定工作分包通知书-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -105,13 +130,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -122,7 +147,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 2d74eac..abf2930 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -12,7 +12,9 @@
   customerName: '',
   formId: '',
   noticeNo: '',
+  outsourceItem: '',
   outsourcerName: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
@@ -30,17 +32,17 @@
 })
 const columns = ref([
   {
-    text: '通知书编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知书名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
   {
-    text: '受检单位名称',
+    text: '委托单位',
     value: 'customerName',
     align: 'center',
   },
@@ -50,10 +52,15 @@
     align: 'center',
   },
   {
-    text: '申请人',
-    value: 'createUserName',
+    text: '分包项目',
+    value: 'outsourceItem',
     align: 'center',
   },
+  // {
+  //   text: '申请人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
 
   {
     text: '申请时间',
@@ -91,6 +98,8 @@
   listQuery.applicantTimeStart = ''
   listQuery.approvalStatus = ''
   listQuery.customerName = ''
+  listQuery.outsourceItem = ''
+  listQuery.noticeName = ''
   listQuery.formId = ''
   listQuery.noticeNo = ''
   listQuery.outsourcerName = ''
@@ -126,21 +135,27 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.noticeNo" placeholder="通知书编号" clearable />
+        <el-input v-model.trim="listQuery.noticeNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.customerName" placeholder="受检单位名称" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.customerName" placeholder="委托单位" clearable />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+        <el-input v-model.trim="listQuery.outsourceItem" placeholder="分包项目" clearable />
       </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+      </search-item> -->
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
new file mode 100644
index 0000000..8f76d0b
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { handlerApproval } from '@/api/eqpt/MeasurementBusiness/opinion'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  // comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
+  formData.type = type
+  formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type) {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="90px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <!-- <el-radio label="reject" size="large">
+                驳回
+              </el-radio> -->
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
index a438c2a..bb2b778 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
@@ -3,14 +3,19 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import ApprovalDialog from './ApprovalDialog.vue'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
 import { getUserDept } from '@/api/system/user'
-import { addOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { addOpinion, cancelOpinion, delOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { delTextBtn, editBtn, submitBtn } from '@/utils/applyBtns'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
 const tableRef = ref()
+const statusName = $route.query.statusName as string
 // 显示标题
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -44,6 +49,8 @@
 }) // 表单
 const rules = ref<FormRules>({
   appealUserName: [{ required: true, message: '申诉人', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
+  formName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -53,8 +60,8 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
-  if ($route.params.type === 'update' || $route.params.type === 'create') {
-    ruleForm.value.formName = '委托方意见登记表'
+  if ($route.params.type === 'create') {
+    ruleForm.value.formName = ''
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
@@ -83,104 +90,269 @@
   })
 }
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      if (!ruleForm.value.suggestContent) {
-        ElMessage.warning('请先填写意见内容')
-        return
-      }
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-        update()
-      })
-    }
-  })
-}
+// const saveForm = async (formEl: FormInstance | undefined) => {
+//   if (!formEl) { return }
+//   await formEl.validate((valid, fields) => {
+//     if (valid) {
+//       if (!ruleForm.value.suggestContent) {
+//         ElMessage.warning('请先填写意见内容')
+//         return
+//       }
+//       ElMessageBox.confirm(
+//         '确认保存吗？',
+//         '提示',
+//         {
+//           confirmButtonText: '确认',
+//           cancelButtonText: '取消',
+//           type: 'warning',
+//         },
+//       ).then((res) => {
+//         update()
+//       })
+//     }
+//   })
+// }
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
 }
+const { proxy } = getCurrentInstance() as any
+const permUrl = ref({
+  agree: '/tested/pmetering/plan/agree',
+  reject: '/tested/pmetering/plan/reject',
+})
+// 审批
+const approvalDialogRef = ref()
+const apply = (type: string) => {
+  const data = JSON.parse($route.query.row as string)
+  approvalDialogRef.value.initDialog(type, data.taskId, data.processId, ruleForm.value.id)
+}
+// 编辑
+const editForm = () => {
+  $router.push({
+    params: { ...$route.params, type: 'update' },
+    query: { ...$route.query },
+  })
+}
+// 保存
+const submitId = ref('')
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, _fields) => {
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then((_res) => {
+      if (submitId.value) {
+        ruleForm.value.id = submitId.value
+      }
+      addOpinion(ruleForm.value).then((res) => {
+        submitId.value = res.data
+        // close()
+        if (statusName === '已取消' || statusName === '未通过') {
+          submitOpinion({ id: submitId.value, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((res) => {
+            ElMessage.success('已提交')
+            close()
+          })
+        }
+        else {
+          ElMessage.success('保存成功')
+        }
+      })
+    })
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((_res) => {
+    submitOpinion({ id: submitId.value, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((_res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 删除
+const delForm = () => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+    })
+  })
+}
+// 取消
+const cancelForm = () => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    cancelOpinion({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      // close()
+      close()
+    })
+  })
+}
+// 详情
+const processId = ref()
+// detailPlan(data.id).then((res) => {
+//   processId.value = res.data.processId
+//   console.log(processId.value, 'processId.value')
+// })
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+const activeName = ref('基本信息')
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`委托方意见登记表-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.agree) " type="primary" @click="apply('agree')">
+          同意
+        </el-button>
+        <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.reject)" type="primary" @click="apply('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
+          编辑
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
+          提交
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
+        <el-button v-if="delTextBtn(statusName)" type="info" @click="delForm()">
+          删除
+        </el-button>
+        <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
+          取消
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="表单编号" prop="formNo">
-              <el-input v-model.trim="ruleForm.formNo" placeholder="系统自动生成" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="表单名称" prop="formName">
-              <el-input v-model.trim="ruleForm.formName" placeholder="表单名称" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="单位" props="senderName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="单位" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门">
-              <el-input v-model.trim="ruleForm.customerDeptName" placeholder="部门" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="申诉人" prop="appealUserName">
-              <el-input v-model.trim="ruleForm.appealUserName" placeholder="申诉人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建人" prop="createUserName">
-              <el-input v-model.trim="ruleForm.createUserName" placeholder="创建人" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间" prop="createTime">
-              <el-input v-model.trim="ruleForm.createTime" placeholder="创建时间" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+    <detail-block-com v-if="statusName !== '草稿箱' && $route.path.includes('detail')">
+      <el-radio-group v-model="activeName">
+        <el-radio-button label="基本信息">
+          基本信息
+        </el-radio-button>
+        <el-radio-button label="审批详情">
+          审批详情
+        </el-radio-button>
+      </el-radio-group>
     </detail-block-com>
-    <detail-block-com>
-      <detail-block-switch title="意见内容">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="1" />
-          <el-col :span="22">
-            <el-input
-              v-model.trim="ruleForm.suggestContent" :rows="4" :disabled="$route.path.includes('detail')"
-              type="textarea" placeholder="意见内容"
-            />
-          </el-col>
-          <el-col :span="1" />
-        </el-row>
-      </detail-block-switch>
-    </detail-block-com>
+    <template v-if="activeName === '基本信息'">
+      <detail-block-com>
+        <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="文件编号" prop="formNo">
+                <el-input v-model.trim="ruleForm.formNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标题" prop="formName">
+                <el-input v-model.trim="ruleForm.formName" placeholder="标题" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="单位" props="senderName">
+                <el-input v-model.trim="ruleForm.customerName" placeholder="单位" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="部门">
+                <el-input v-model.trim="ruleForm.customerDeptName" placeholder="部门" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="申诉人" prop="appealUserName">
+                <el-input v-model.trim="ruleForm.appealUserName" placeholder="申诉人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建人" prop="createUserName">
+                <el-input v-model.trim="ruleForm.createUserName" placeholder="创建人" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间" prop="createTime">
+                <el-input v-model.trim="ruleForm.createTime" placeholder="创建时间" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实验室代码" prop="labCode">
+                <!-- <el-input v-model.trim="ruleForm.labCode" placeholder="创建时间" disabled /> -->
+                <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                  <el-option
+                    v-for="item in labCodeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <detail-block-switch title="意见内容">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="1" />
+            <el-col :span="22">
+              <el-input
+                v-model.trim="ruleForm.suggestContent" :rows="4" :disabled="$route.path.includes('detail')"
+                type="textarea" placeholder="意见内容"
+              />
+            </el-col>
+            <el-col :span="1" />
+          </el-row>
+        </detail-block-switch>
+      </detail-block-com>
+    </template>
+    <approval-record-table v-if="activeName === '审批详情'" :process-id="ruleForm.processId" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
new file mode 100644
index 0000000..b914ef1
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -0,0 +1,408 @@
+<!-- 委托方意见登记表 -->
+<script lang="ts" setup name="ClientOpinionForm">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import ApprovalDialog from './ApprovalDialog.vue'
+import { cancelOpinion, delOpinion, getListPage, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getDictByCode } from '@/api/system/dict'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+const $props = defineProps({
+  statusName: {
+    type: String,
+    default: '',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const applyDict = ref<{ [key: string]: string }>({
+  审批: '',
+  草稿箱: '1',
+  审批中: '3',
+  已通过: '4',
+  未通过: '5',
+  已取消: '6',
+})
+const listQuery = reactive({
+  approvalStatus: '0',
+  createTimeEnd: '',
+  createTimeStart: '',
+  // createUserName: '',
+  // customerDeptName: '',
+  // customerName: '',
+  customerId: '',
+  customerDeptId: '',
+  handleStatus: '',
+  formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL,
+  formNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 证书有效期开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'formNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'formName',
+    align: 'center',
+  },
+  {
+    text: '单位',
+    value: 'customerName',
+    align: 'center',
+  },
+  {
+    text: '部门',
+    value: 'customerDeptName',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage(listQuery, $props.statusName).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+// 审批状态发生变化
+watch(() => $props.statusName, (newVal) => {
+  if (newVal) {
+    listQuery.handleStatus = ''
+    listQuery.approvalStatus = applyDict.value[newVal] as string
+    fetchData()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.formNo = ''
+  // listQuery.createUserName = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.customerId = ''
+  listQuery.customerDeptId = ''
+  listQuery.handleStatus = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+// const handler = (row: any, type: string) => {
+//   $router.push({
+//     path: `/opinion/${type}`,
+//     query: {
+//       row: JSON.stringify(row),
+//       id: row.id,
+//     },
+//   })
+// }
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitOpinion({ id: row.id, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 取消
+const canHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelOpinion({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      // close()
+      search()
+    })
+  })
+}
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `opinion/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+    },
+  })
+}
+// 详情
+const detail = (row: any) => {
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: 'opinion/detail',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+      },
+    })
+  }
+}
+const permUrl = {
+  add: '/tested/business/opinion/add',
+  edit: '/tested/business/opinion/edit',
+  agree: '/tested/business/opinion/agree',
+  reject: '/tested/business/opinion/reject',
+  submit: '/tested/business/opinion/submit',
+  cancel: '/tested/business/opinion/cancel',
+  del: '/tested/business/opinion/delete',
+}
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 处置情况
+const handleStatusList = ref<{ id: string; value: string; name: string }[]>([])
+// 获取字典
+const fetchDict = () => {
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  // 处置情况
+
+  getDictByCode('eqptHandleStatus').then((res) => {
+    handleStatusList.value = res.data
+  })
+}
+fetchDict()
+// 监听单位，修改部门
+watch(() => listQuery.customerId, (newVal) => {
+  listQuery.customerDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.formNo" placeholder="文件编号" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.customerId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.customerDeptId"
+          style="width: 100%;"
+          :data="deptList"
+          :render-after-expand="false"
+          check-strictly
+          placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
+        />
+      </search-item>
+      <search-item v-if="$props.statusName === '全部'">
+        <el-select v-model="listQuery.handleStatus" clearable placeholder="处置情况">
+          <el-option v-for="item in handleStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template v-if="$props.statusName === '全部'" #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/opinion/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="审核人" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approveUserName }}
+            </template>
+          </el-table-column>
+          <el-table-column v-if="$props.statusName === '全部'" label="处置情况" align="center">
+            <template #default=" scope ">
+              {{ scope.row.handleStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column v-if="$props.statusName !== '全部'" label="审批状态" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="160" align="center">
+            <template #default=" scope ">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="primary" size="small"
+                @click="handler(scope.row, 'update')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del) && $props.statusName !== '全部'" link type="danger" size="small"
+                @click="delHandler(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 4054b67..9fce832 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -1,173 +1,80 @@
 <!-- 委托方意见登记表 -->
-<script lang="ts" setup name="ClientOpinionForm">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { delOpinion, getListPage } from '@/api/eqpt/MeasurementBusiness/opinion'
-const { proxy } = getCurrentInstance() as any
-const listQuery = reactive({
-  approvalStatus: '0',
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
-  customerDeptName: '',
-  customerName: '',
-  formId: '',
-  formNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 证书有效期开始结束时间
-const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
-    }
-  }
-})
-const columns = ref([
-  {
-    text: '表单编号',
-    value: 'formNo',
-    align: 'center',
-  },
-  {
-    text: '单位',
-    value: 'customerName',
-    align: 'center',
-  },
-  {
-    text: '部门',
-    value: 'customerDeptName',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    align: 'center',
-  },
+<script lang="ts" setup name="DeviceInfo">
+import infoList from './components/list.vue'
+import { getDictByCode } from '@/api/system/dict'
+// export interface menuType {
+//   name: string
+//   comp: any
+// }
+const menu = ref<any[]>([
+  { name: '全部', com: infoList, status: '0' },
+  { name: '已审批', com: infoList, status: '0' },
+  { name: '待审批', com: infoList, status: '1' },
+  { name: '审批', com: infoList, status: '2' },
+  { name: '草稿箱', com: infoList, status: '0' },
+  { name: '审批中', com: infoList, status: '0' },
+  { name: '已通过', com: infoList, status: '3' },
+  { name: '未通过', com: infoList, status: '4' },
+  { name: '已取消', com: infoList, status: '4' },
 ])
-const list = ref([])
-const total = ref(0)
-const listLoading = ref(true)
-
-// 获取数据
-const fetchData = (isNowPage = true) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getListPage(listQuery).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-fetchData()
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 重置
-const reset = () => {
-  datetimerange.value = []
-  listQuery.formNo = ''
-  listQuery.createUserName = ''
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  $router.push({
-    path: `/opinion/${type}`,
-    query: {
-      row: JSON.stringify(row),
-      id: row.id,
-    },
-  })
-}
-const delFun = (row: any) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
-      ElMessage.success('操作成功')
-      search()
+const current = ref('')
+const com = shallowRef(infoList)
+const currentApprovalStatus = ref('0')
+const approvalStatusMap = ref({}) as any
+const approvalStatusReserveMap = ref({}) as any
+// 获取菜单状态
+const getMenuStatus = () => {
+  getDictByCode('approvalStatus').then((res) => {
+    // 审批状态字典 {1：草稿箱}
+    res.data.forEach((item: any) => {
+      approvalStatusMap.value[`${item.value}`] = item.name
     })
+    // 审批状态字典 {草稿箱: 1}
+    res.data.forEach((item: any) => {
+      approvalStatusReserveMap.value[item.name] = `${item.value}`
+    })
+    // console.log(approvalStatusReserveMap.value)
   })
 }
+
+watch(current, (newValue) => {
+  window.sessionStorage.setItem('business-opinion', newValue)
+  com.value = menu.value.filter(item => item.name === newValue)[0].com
+})
+
+onMounted(async () => {
+  await getMenuStatus()
+  current.value = ''
+  current.value = window.sessionStorage.getItem('business-opinion') || '全部'
+  com.value = menu.value.filter(item => item.name === current.value)[0].com
+})
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.formNo" placeholder="表单编号" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/tested/business/opinion/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-      </template>
-      <!-- 普通表格 -->
-      <normal-table
-        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="160" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
-                查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm('/tested/business/opinion/delete')" link type="danger" size="small" @click="delFun(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="com" :status-name="current" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 68px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }
diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
index 5773128..b4bfa1b 100644
--- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
@@ -4,9 +4,11 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import pdfFile from './pdfFile.vue'
 import { printPdf } from '@/utils/printUtils'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { exportFile, printContent } from '@/utils/exportUtils'
+import { getFiles } from '@/utils/download'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -62,29 +64,52 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: $route.query.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    printPdf(res.data)
-    // exportFile(res.data, '123.pdf')
+// const print = () => {
+//   printPage({ id: $route.query.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     printPdf(res.data)
+//     // exportFile(res.data, '123.pdf')
+//   })
+// }
+// 打印
+// const printObj = ref({
+//   id: 'form', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
 // 打印
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`检测结果复查通知单-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -96,13 +121,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -118,7 +143,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
new file mode 100644
index 0000000..1de13fb
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
@@ -0,0 +1,46 @@
+<!-- 文件预览组件 -->
+<script lang="ts" setup name="FilePreview">
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
+import { getBase64, getObjectURL } from '@/utils/download'
+const emit = defineEmits(['getFile'])
+
+const pdfUrl = ref('')
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  emit('getFile', (res: any) => {
+    if (res) {
+      getBase64(res.data).then((res) => {
+        pdfUrl.value = res as string
+      })
+      pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+      loading.close()
+    }
+    else {
+      loading.close()
+    }
+  })
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <!-- pdf预览 -->
+  <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5af6c7f..ffc8b7c 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -6,44 +6,45 @@
 import { printJSON } from '@/utils/printUtils'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
+  noticeDateEnd: '',
+  noticeDateStart: '',
+  // createUserName: '',
   noticeNo: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeDateEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.noticeDateStart = `${newVal[0]} 00:00:00`
+      listQuery.noticeDateEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
 const columns = ref([
   {
-    text: '通知单编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知单名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
+    text: '通知时间',
+    value: 'noticeDate',
     align: 'center',
   },
 ])
@@ -64,7 +65,7 @@
     listLoading.value = false
   })
 }
-fetchData()
+// fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -73,9 +74,10 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.createUserName = ''
+  listQuery.noticeDateEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeName = ''
+  // listQuery.createUserName = ''
   listQuery.noticeNo = ''
   listQuery.offset = 1
   listQuery.limit = 20
@@ -127,12 +129,12 @@
         <el-input v-model.trim="listQuery.noticeNo" placeholder="通知单编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/notice/components/detail.vue b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
index 3e286cf..51b35cf 100644
--- a/src/views/tested/MeasurementBusiness/notice/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
@@ -6,9 +6,11 @@
 // import * as pdfjsLib from 'pdfjs-dist'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import { getFiles } from '@/utils/download'
 import { printContent } from '@/utils/exportUtils'
 import { getPageDetail, printPage } from '@/api/eqpt/MeasurementBusiness/notice'
 import { printPdf } from '@/utils/printUtils'
+import pdfFile from '@/views/tested/MeasurementBusiness/detection/components/pdfFile.vue'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -72,28 +74,51 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    // printContent(res.data)
-    printPdf(res.data)
+// const print = () => {
+//   printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     // printContent(res.data)
+//     printPdf(res.data)
+//   })
+// }
+// const printObj = ref({
+//   id: 'print-page', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
-const printObj = ref({
-  id: 'print-page', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`测试、校准或检定工作分包通知书-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -105,13 +130,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -122,7 +147,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 2d74eac..abf2930 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -12,7 +12,9 @@
   customerName: '',
   formId: '',
   noticeNo: '',
+  outsourceItem: '',
   outsourcerName: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
@@ -30,17 +32,17 @@
 })
 const columns = ref([
   {
-    text: '通知书编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知书名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
   {
-    text: '受检单位名称',
+    text: '委托单位',
     value: 'customerName',
     align: 'center',
   },
@@ -50,10 +52,15 @@
     align: 'center',
   },
   {
-    text: '申请人',
-    value: 'createUserName',
+    text: '分包项目',
+    value: 'outsourceItem',
     align: 'center',
   },
+  // {
+  //   text: '申请人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
 
   {
     text: '申请时间',
@@ -91,6 +98,8 @@
   listQuery.applicantTimeStart = ''
   listQuery.approvalStatus = ''
   listQuery.customerName = ''
+  listQuery.outsourceItem = ''
+  listQuery.noticeName = ''
   listQuery.formId = ''
   listQuery.noticeNo = ''
   listQuery.outsourcerName = ''
@@ -126,21 +135,27 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.noticeNo" placeholder="通知书编号" clearable />
+        <el-input v-model.trim="listQuery.noticeNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.customerName" placeholder="受检单位名称" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.customerName" placeholder="委托单位" clearable />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+        <el-input v-model.trim="listQuery.outsourceItem" placeholder="分包项目" clearable />
       </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+      </search-item> -->
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
new file mode 100644
index 0000000..8f76d0b
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { handlerApproval } from '@/api/eqpt/MeasurementBusiness/opinion'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  // comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
+  formData.type = type
+  formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type) {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="90px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <!-- <el-radio label="reject" size="large">
+                驳回
+              </el-radio> -->
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
index a438c2a..bb2b778 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
@@ -3,14 +3,19 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import ApprovalDialog from './ApprovalDialog.vue'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
 import { getUserDept } from '@/api/system/user'
-import { addOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { addOpinion, cancelOpinion, delOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { delTextBtn, editBtn, submitBtn } from '@/utils/applyBtns'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
 const tableRef = ref()
+const statusName = $route.query.statusName as string
 // 显示标题
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -44,6 +49,8 @@
 }) // 表单
 const rules = ref<FormRules>({
   appealUserName: [{ required: true, message: '申诉人', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
+  formName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -53,8 +60,8 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
-  if ($route.params.type === 'update' || $route.params.type === 'create') {
-    ruleForm.value.formName = '委托方意见登记表'
+  if ($route.params.type === 'create') {
+    ruleForm.value.formName = ''
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
@@ -83,104 +90,269 @@
   })
 }
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      if (!ruleForm.value.suggestContent) {
-        ElMessage.warning('请先填写意见内容')
-        return
-      }
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-        update()
-      })
-    }
-  })
-}
+// const saveForm = async (formEl: FormInstance | undefined) => {
+//   if (!formEl) { return }
+//   await formEl.validate((valid, fields) => {
+//     if (valid) {
+//       if (!ruleForm.value.suggestContent) {
+//         ElMessage.warning('请先填写意见内容')
+//         return
+//       }
+//       ElMessageBox.confirm(
+//         '确认保存吗？',
+//         '提示',
+//         {
+//           confirmButtonText: '确认',
+//           cancelButtonText: '取消',
+//           type: 'warning',
+//         },
+//       ).then((res) => {
+//         update()
+//       })
+//     }
+//   })
+// }
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
 }
+const { proxy } = getCurrentInstance() as any
+const permUrl = ref({
+  agree: '/tested/pmetering/plan/agree',
+  reject: '/tested/pmetering/plan/reject',
+})
+// 审批
+const approvalDialogRef = ref()
+const apply = (type: string) => {
+  const data = JSON.parse($route.query.row as string)
+  approvalDialogRef.value.initDialog(type, data.taskId, data.processId, ruleForm.value.id)
+}
+// 编辑
+const editForm = () => {
+  $router.push({
+    params: { ...$route.params, type: 'update' },
+    query: { ...$route.query },
+  })
+}
+// 保存
+const submitId = ref('')
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, _fields) => {
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then((_res) => {
+      if (submitId.value) {
+        ruleForm.value.id = submitId.value
+      }
+      addOpinion(ruleForm.value).then((res) => {
+        submitId.value = res.data
+        // close()
+        if (statusName === '已取消' || statusName === '未通过') {
+          submitOpinion({ id: submitId.value, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((res) => {
+            ElMessage.success('已提交')
+            close()
+          })
+        }
+        else {
+          ElMessage.success('保存成功')
+        }
+      })
+    })
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((_res) => {
+    submitOpinion({ id: submitId.value, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((_res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 删除
+const delForm = () => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+    })
+  })
+}
+// 取消
+const cancelForm = () => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    cancelOpinion({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      // close()
+      close()
+    })
+  })
+}
+// 详情
+const processId = ref()
+// detailPlan(data.id).then((res) => {
+//   processId.value = res.data.processId
+//   console.log(processId.value, 'processId.value')
+// })
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+const activeName = ref('基本信息')
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`委托方意见登记表-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.agree) " type="primary" @click="apply('agree')">
+          同意
+        </el-button>
+        <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.reject)" type="primary" @click="apply('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
+          编辑
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
+          提交
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
+        <el-button v-if="delTextBtn(statusName)" type="info" @click="delForm()">
+          删除
+        </el-button>
+        <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
+          取消
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="表单编号" prop="formNo">
-              <el-input v-model.trim="ruleForm.formNo" placeholder="系统自动生成" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="表单名称" prop="formName">
-              <el-input v-model.trim="ruleForm.formName" placeholder="表单名称" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="单位" props="senderName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="单位" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门">
-              <el-input v-model.trim="ruleForm.customerDeptName" placeholder="部门" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="申诉人" prop="appealUserName">
-              <el-input v-model.trim="ruleForm.appealUserName" placeholder="申诉人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建人" prop="createUserName">
-              <el-input v-model.trim="ruleForm.createUserName" placeholder="创建人" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间" prop="createTime">
-              <el-input v-model.trim="ruleForm.createTime" placeholder="创建时间" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+    <detail-block-com v-if="statusName !== '草稿箱' && $route.path.includes('detail')">
+      <el-radio-group v-model="activeName">
+        <el-radio-button label="基本信息">
+          基本信息
+        </el-radio-button>
+        <el-radio-button label="审批详情">
+          审批详情
+        </el-radio-button>
+      </el-radio-group>
     </detail-block-com>
-    <detail-block-com>
-      <detail-block-switch title="意见内容">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="1" />
-          <el-col :span="22">
-            <el-input
-              v-model.trim="ruleForm.suggestContent" :rows="4" :disabled="$route.path.includes('detail')"
-              type="textarea" placeholder="意见内容"
-            />
-          </el-col>
-          <el-col :span="1" />
-        </el-row>
-      </detail-block-switch>
-    </detail-block-com>
+    <template v-if="activeName === '基本信息'">
+      <detail-block-com>
+        <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="文件编号" prop="formNo">
+                <el-input v-model.trim="ruleForm.formNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标题" prop="formName">
+                <el-input v-model.trim="ruleForm.formName" placeholder="标题" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="单位" props="senderName">
+                <el-input v-model.trim="ruleForm.customerName" placeholder="单位" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="部门">
+                <el-input v-model.trim="ruleForm.customerDeptName" placeholder="部门" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="申诉人" prop="appealUserName">
+                <el-input v-model.trim="ruleForm.appealUserName" placeholder="申诉人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建人" prop="createUserName">
+                <el-input v-model.trim="ruleForm.createUserName" placeholder="创建人" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间" prop="createTime">
+                <el-input v-model.trim="ruleForm.createTime" placeholder="创建时间" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实验室代码" prop="labCode">
+                <!-- <el-input v-model.trim="ruleForm.labCode" placeholder="创建时间" disabled /> -->
+                <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                  <el-option
+                    v-for="item in labCodeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <detail-block-switch title="意见内容">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="1" />
+            <el-col :span="22">
+              <el-input
+                v-model.trim="ruleForm.suggestContent" :rows="4" :disabled="$route.path.includes('detail')"
+                type="textarea" placeholder="意见内容"
+              />
+            </el-col>
+            <el-col :span="1" />
+          </el-row>
+        </detail-block-switch>
+      </detail-block-com>
+    </template>
+    <approval-record-table v-if="activeName === '审批详情'" :process-id="ruleForm.processId" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
new file mode 100644
index 0000000..b914ef1
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -0,0 +1,408 @@
+<!-- 委托方意见登记表 -->
+<script lang="ts" setup name="ClientOpinionForm">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import ApprovalDialog from './ApprovalDialog.vue'
+import { cancelOpinion, delOpinion, getListPage, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getDictByCode } from '@/api/system/dict'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+const $props = defineProps({
+  statusName: {
+    type: String,
+    default: '',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const applyDict = ref<{ [key: string]: string }>({
+  审批: '',
+  草稿箱: '1',
+  审批中: '3',
+  已通过: '4',
+  未通过: '5',
+  已取消: '6',
+})
+const listQuery = reactive({
+  approvalStatus: '0',
+  createTimeEnd: '',
+  createTimeStart: '',
+  // createUserName: '',
+  // customerDeptName: '',
+  // customerName: '',
+  customerId: '',
+  customerDeptId: '',
+  handleStatus: '',
+  formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL,
+  formNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 证书有效期开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'formNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'formName',
+    align: 'center',
+  },
+  {
+    text: '单位',
+    value: 'customerName',
+    align: 'center',
+  },
+  {
+    text: '部门',
+    value: 'customerDeptName',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage(listQuery, $props.statusName).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+// 审批状态发生变化
+watch(() => $props.statusName, (newVal) => {
+  if (newVal) {
+    listQuery.handleStatus = ''
+    listQuery.approvalStatus = applyDict.value[newVal] as string
+    fetchData()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.formNo = ''
+  // listQuery.createUserName = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.customerId = ''
+  listQuery.customerDeptId = ''
+  listQuery.handleStatus = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+// const handler = (row: any, type: string) => {
+//   $router.push({
+//     path: `/opinion/${type}`,
+//     query: {
+//       row: JSON.stringify(row),
+//       id: row.id,
+//     },
+//   })
+// }
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitOpinion({ id: row.id, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 取消
+const canHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelOpinion({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      // close()
+      search()
+    })
+  })
+}
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `opinion/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+    },
+  })
+}
+// 详情
+const detail = (row: any) => {
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: 'opinion/detail',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+      },
+    })
+  }
+}
+const permUrl = {
+  add: '/tested/business/opinion/add',
+  edit: '/tested/business/opinion/edit',
+  agree: '/tested/business/opinion/agree',
+  reject: '/tested/business/opinion/reject',
+  submit: '/tested/business/opinion/submit',
+  cancel: '/tested/business/opinion/cancel',
+  del: '/tested/business/opinion/delete',
+}
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 处置情况
+const handleStatusList = ref<{ id: string; value: string; name: string }[]>([])
+// 获取字典
+const fetchDict = () => {
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  // 处置情况
+
+  getDictByCode('eqptHandleStatus').then((res) => {
+    handleStatusList.value = res.data
+  })
+}
+fetchDict()
+// 监听单位，修改部门
+watch(() => listQuery.customerId, (newVal) => {
+  listQuery.customerDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.formNo" placeholder="文件编号" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.customerId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.customerDeptId"
+          style="width: 100%;"
+          :data="deptList"
+          :render-after-expand="false"
+          check-strictly
+          placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
+        />
+      </search-item>
+      <search-item v-if="$props.statusName === '全部'">
+        <el-select v-model="listQuery.handleStatus" clearable placeholder="处置情况">
+          <el-option v-for="item in handleStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template v-if="$props.statusName === '全部'" #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/opinion/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="审核人" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approveUserName }}
+            </template>
+          </el-table-column>
+          <el-table-column v-if="$props.statusName === '全部'" label="处置情况" align="center">
+            <template #default=" scope ">
+              {{ scope.row.handleStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column v-if="$props.statusName !== '全部'" label="审批状态" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="160" align="center">
+            <template #default=" scope ">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="primary" size="small"
+                @click="handler(scope.row, 'update')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del) && $props.statusName !== '全部'" link type="danger" size="small"
+                @click="delHandler(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 4054b67..9fce832 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -1,173 +1,80 @@
 <!-- 委托方意见登记表 -->
-<script lang="ts" setup name="ClientOpinionForm">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { delOpinion, getListPage } from '@/api/eqpt/MeasurementBusiness/opinion'
-const { proxy } = getCurrentInstance() as any
-const listQuery = reactive({
-  approvalStatus: '0',
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
-  customerDeptName: '',
-  customerName: '',
-  formId: '',
-  formNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 证书有效期开始结束时间
-const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
-    }
-  }
-})
-const columns = ref([
-  {
-    text: '表单编号',
-    value: 'formNo',
-    align: 'center',
-  },
-  {
-    text: '单位',
-    value: 'customerName',
-    align: 'center',
-  },
-  {
-    text: '部门',
-    value: 'customerDeptName',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    align: 'center',
-  },
+<script lang="ts" setup name="DeviceInfo">
+import infoList from './components/list.vue'
+import { getDictByCode } from '@/api/system/dict'
+// export interface menuType {
+//   name: string
+//   comp: any
+// }
+const menu = ref<any[]>([
+  { name: '全部', com: infoList, status: '0' },
+  { name: '已审批', com: infoList, status: '0' },
+  { name: '待审批', com: infoList, status: '1' },
+  { name: '审批', com: infoList, status: '2' },
+  { name: '草稿箱', com: infoList, status: '0' },
+  { name: '审批中', com: infoList, status: '0' },
+  { name: '已通过', com: infoList, status: '3' },
+  { name: '未通过', com: infoList, status: '4' },
+  { name: '已取消', com: infoList, status: '4' },
 ])
-const list = ref([])
-const total = ref(0)
-const listLoading = ref(true)
-
-// 获取数据
-const fetchData = (isNowPage = true) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getListPage(listQuery).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-fetchData()
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 重置
-const reset = () => {
-  datetimerange.value = []
-  listQuery.formNo = ''
-  listQuery.createUserName = ''
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  $router.push({
-    path: `/opinion/${type}`,
-    query: {
-      row: JSON.stringify(row),
-      id: row.id,
-    },
-  })
-}
-const delFun = (row: any) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
-      ElMessage.success('操作成功')
-      search()
+const current = ref('')
+const com = shallowRef(infoList)
+const currentApprovalStatus = ref('0')
+const approvalStatusMap = ref({}) as any
+const approvalStatusReserveMap = ref({}) as any
+// 获取菜单状态
+const getMenuStatus = () => {
+  getDictByCode('approvalStatus').then((res) => {
+    // 审批状态字典 {1：草稿箱}
+    res.data.forEach((item: any) => {
+      approvalStatusMap.value[`${item.value}`] = item.name
     })
+    // 审批状态字典 {草稿箱: 1}
+    res.data.forEach((item: any) => {
+      approvalStatusReserveMap.value[item.name] = `${item.value}`
+    })
+    // console.log(approvalStatusReserveMap.value)
   })
 }
+
+watch(current, (newValue) => {
+  window.sessionStorage.setItem('business-opinion', newValue)
+  com.value = menu.value.filter(item => item.name === newValue)[0].com
+})
+
+onMounted(async () => {
+  await getMenuStatus()
+  current.value = ''
+  current.value = window.sessionStorage.getItem('business-opinion') || '全部'
+  com.value = menu.value.filter(item => item.name === current.value)[0].com
+})
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.formNo" placeholder="表单编号" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/tested/business/opinion/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-      </template>
-      <!-- 普通表格 -->
-      <normal-table
-        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="160" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
-                查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm('/tested/business/opinion/delete')" link type="danger" size="small" @click="delFun(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="com" :status-name="current" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 68px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index 1aad1c4..0a13174 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -13,6 +14,7 @@
   formNo: '',
   groupCode: '',
   labCode: '',
+  measureItem: '',
   offset: 1,
   limit: 20,
 })
@@ -30,23 +32,28 @@
 })
 const columns = ref([
   {
-    text: '评审表编号',
+    text: '文件编号',
     value: 'formNo',
     align: 'center',
   },
+  // {
+  //   text: '文件名称',
+  //   value: 'formName',
+  //   align: 'center',
+  // },
   {
-    text: '评审表名称',
-    value: 'formName',
+    text: '实验室',
+    value: 'labCodeName',
     align: 'center',
   },
   {
-    text: '实验室代码',
-    value: 'labCode',
+    text: '专业组',
+    value: 'groupCodeName',
     align: 'center',
   },
   {
-    text: '组别代码',
-    value: 'groupCode',
+    text: '测试、校准或检定项目',
+    value: 'measureItem',
     align: 'center',
   },
   {
@@ -54,11 +61,11 @@
     value: 'signStatusName',
     align: 'center',
   },
-  {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
     text: '创建时间',
     value: 'createTime',
@@ -97,6 +104,7 @@
   listQuery.formNo = ''
   listQuery.groupCode = ''
   listQuery.labCode = ''
+  listQuery.measureItem = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -122,6 +130,18 @@
     },
   })
 }
+// 获取字典
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+const groupCodeList = ref<{ id: string; value: string; name: string }[]>()
+const fetchDict = () => {
+  getDictByCode('bizLabCode').then((res) => {
+    labCodeList.value = res.data
+  })
+  getDictByCode('bizGroupCode').then((res) => {
+    groupCodeList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -129,15 +149,35 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.formNo" placeholder="评审表编号" clearable />
+        <el-input v-model.trim="listQuery.formNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.labCode" placeholder="实验室代码" clearable />
+        <!-- <el-input v-model.trim="listQuery.labCode" placeholder="实验室" clearable /> -->
+        <el-select v-model="listQuery.labCode" filterable placeholder="实验室" style="width: 100%;">
+          <el-option
+            v-for="item in labCodeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.groupCode" placeholder="组别代码" clearable />
+        <el-select v-model="listQuery.groupCode" filterable placeholder="专业组" style="width: 100%;">
+          <el-option
+            v-for="item in groupCodeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+        <!-- <el-input v-model.trim="listQuery.groupCode" placeholder="专业组" clearable /> -->
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.measureItem" placeholder="测试、校准或检定项目" clearable />
+      </search-item>
+
+      <search-item>
         <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
       <search-item>

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }
diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
index 5773128..b4bfa1b 100644
--- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
@@ -4,9 +4,11 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import pdfFile from './pdfFile.vue'
 import { printPdf } from '@/utils/printUtils'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { exportFile, printContent } from '@/utils/exportUtils'
+import { getFiles } from '@/utils/download'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -62,29 +64,52 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: $route.query.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    printPdf(res.data)
-    // exportFile(res.data, '123.pdf')
+// const print = () => {
+//   printPage({ id: $route.query.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     printPdf(res.data)
+//     // exportFile(res.data, '123.pdf')
+//   })
+// }
+// 打印
+// const printObj = ref({
+//   id: 'form', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
 // 打印
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`检测结果复查通知单-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -96,13 +121,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -118,7 +143,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
new file mode 100644
index 0000000..1de13fb
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
@@ -0,0 +1,46 @@
+<!-- 文件预览组件 -->
+<script lang="ts" setup name="FilePreview">
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
+import { getBase64, getObjectURL } from '@/utils/download'
+const emit = defineEmits(['getFile'])
+
+const pdfUrl = ref('')
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  emit('getFile', (res: any) => {
+    if (res) {
+      getBase64(res.data).then((res) => {
+        pdfUrl.value = res as string
+      })
+      pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+      loading.close()
+    }
+    else {
+      loading.close()
+    }
+  })
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <!-- pdf预览 -->
+  <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5af6c7f..ffc8b7c 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -6,44 +6,45 @@
 import { printJSON } from '@/utils/printUtils'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
+  noticeDateEnd: '',
+  noticeDateStart: '',
+  // createUserName: '',
   noticeNo: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeDateEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.noticeDateStart = `${newVal[0]} 00:00:00`
+      listQuery.noticeDateEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
 const columns = ref([
   {
-    text: '通知单编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知单名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
+    text: '通知时间',
+    value: 'noticeDate',
     align: 'center',
   },
 ])
@@ -64,7 +65,7 @@
     listLoading.value = false
   })
 }
-fetchData()
+// fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -73,9 +74,10 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.createUserName = ''
+  listQuery.noticeDateEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeName = ''
+  // listQuery.createUserName = ''
   listQuery.noticeNo = ''
   listQuery.offset = 1
   listQuery.limit = 20
@@ -127,12 +129,12 @@
         <el-input v-model.trim="listQuery.noticeNo" placeholder="通知单编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/notice/components/detail.vue b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
index 3e286cf..51b35cf 100644
--- a/src/views/tested/MeasurementBusiness/notice/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
@@ -6,9 +6,11 @@
 // import * as pdfjsLib from 'pdfjs-dist'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import { getFiles } from '@/utils/download'
 import { printContent } from '@/utils/exportUtils'
 import { getPageDetail, printPage } from '@/api/eqpt/MeasurementBusiness/notice'
 import { printPdf } from '@/utils/printUtils'
+import pdfFile from '@/views/tested/MeasurementBusiness/detection/components/pdfFile.vue'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -72,28 +74,51 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    // printContent(res.data)
-    printPdf(res.data)
+// const print = () => {
+//   printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     // printContent(res.data)
+//     printPdf(res.data)
+//   })
+// }
+// const printObj = ref({
+//   id: 'print-page', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
-const printObj = ref({
-  id: 'print-page', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`测试、校准或检定工作分包通知书-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -105,13 +130,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -122,7 +147,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 2d74eac..abf2930 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -12,7 +12,9 @@
   customerName: '',
   formId: '',
   noticeNo: '',
+  outsourceItem: '',
   outsourcerName: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
@@ -30,17 +32,17 @@
 })
 const columns = ref([
   {
-    text: '通知书编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知书名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
   {
-    text: '受检单位名称',
+    text: '委托单位',
     value: 'customerName',
     align: 'center',
   },
@@ -50,10 +52,15 @@
     align: 'center',
   },
   {
-    text: '申请人',
-    value: 'createUserName',
+    text: '分包项目',
+    value: 'outsourceItem',
     align: 'center',
   },
+  // {
+  //   text: '申请人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
 
   {
     text: '申请时间',
@@ -91,6 +98,8 @@
   listQuery.applicantTimeStart = ''
   listQuery.approvalStatus = ''
   listQuery.customerName = ''
+  listQuery.outsourceItem = ''
+  listQuery.noticeName = ''
   listQuery.formId = ''
   listQuery.noticeNo = ''
   listQuery.outsourcerName = ''
@@ -126,21 +135,27 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.noticeNo" placeholder="通知书编号" clearable />
+        <el-input v-model.trim="listQuery.noticeNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.customerName" placeholder="受检单位名称" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.customerName" placeholder="委托单位" clearable />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+        <el-input v-model.trim="listQuery.outsourceItem" placeholder="分包项目" clearable />
       </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+      </search-item> -->
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
new file mode 100644
index 0000000..8f76d0b
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { handlerApproval } from '@/api/eqpt/MeasurementBusiness/opinion'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  // comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
+  formData.type = type
+  formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type) {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="90px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <!-- <el-radio label="reject" size="large">
+                驳回
+              </el-radio> -->
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
index a438c2a..bb2b778 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
@@ -3,14 +3,19 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import ApprovalDialog from './ApprovalDialog.vue'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
 import { getUserDept } from '@/api/system/user'
-import { addOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { addOpinion, cancelOpinion, delOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { delTextBtn, editBtn, submitBtn } from '@/utils/applyBtns'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
 const tableRef = ref()
+const statusName = $route.query.statusName as string
 // 显示标题
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -44,6 +49,8 @@
 }) // 表单
 const rules = ref<FormRules>({
   appealUserName: [{ required: true, message: '申诉人', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
+  formName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -53,8 +60,8 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
-  if ($route.params.type === 'update' || $route.params.type === 'create') {
-    ruleForm.value.formName = '委托方意见登记表'
+  if ($route.params.type === 'create') {
+    ruleForm.value.formName = ''
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
@@ -83,104 +90,269 @@
   })
 }
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      if (!ruleForm.value.suggestContent) {
-        ElMessage.warning('请先填写意见内容')
-        return
-      }
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-        update()
-      })
-    }
-  })
-}
+// const saveForm = async (formEl: FormInstance | undefined) => {
+//   if (!formEl) { return }
+//   await formEl.validate((valid, fields) => {
+//     if (valid) {
+//       if (!ruleForm.value.suggestContent) {
+//         ElMessage.warning('请先填写意见内容')
+//         return
+//       }
+//       ElMessageBox.confirm(
+//         '确认保存吗？',
+//         '提示',
+//         {
+//           confirmButtonText: '确认',
+//           cancelButtonText: '取消',
+//           type: 'warning',
+//         },
+//       ).then((res) => {
+//         update()
+//       })
+//     }
+//   })
+// }
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
 }
+const { proxy } = getCurrentInstance() as any
+const permUrl = ref({
+  agree: '/tested/pmetering/plan/agree',
+  reject: '/tested/pmetering/plan/reject',
+})
+// 审批
+const approvalDialogRef = ref()
+const apply = (type: string) => {
+  const data = JSON.parse($route.query.row as string)
+  approvalDialogRef.value.initDialog(type, data.taskId, data.processId, ruleForm.value.id)
+}
+// 编辑
+const editForm = () => {
+  $router.push({
+    params: { ...$route.params, type: 'update' },
+    query: { ...$route.query },
+  })
+}
+// 保存
+const submitId = ref('')
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, _fields) => {
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then((_res) => {
+      if (submitId.value) {
+        ruleForm.value.id = submitId.value
+      }
+      addOpinion(ruleForm.value).then((res) => {
+        submitId.value = res.data
+        // close()
+        if (statusName === '已取消' || statusName === '未通过') {
+          submitOpinion({ id: submitId.value, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((res) => {
+            ElMessage.success('已提交')
+            close()
+          })
+        }
+        else {
+          ElMessage.success('保存成功')
+        }
+      })
+    })
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((_res) => {
+    submitOpinion({ id: submitId.value, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((_res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 删除
+const delForm = () => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+    })
+  })
+}
+// 取消
+const cancelForm = () => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    cancelOpinion({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      // close()
+      close()
+    })
+  })
+}
+// 详情
+const processId = ref()
+// detailPlan(data.id).then((res) => {
+//   processId.value = res.data.processId
+//   console.log(processId.value, 'processId.value')
+// })
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+const activeName = ref('基本信息')
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`委托方意见登记表-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.agree) " type="primary" @click="apply('agree')">
+          同意
+        </el-button>
+        <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.reject)" type="primary" @click="apply('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
+          编辑
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
+          提交
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
+        <el-button v-if="delTextBtn(statusName)" type="info" @click="delForm()">
+          删除
+        </el-button>
+        <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
+          取消
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="表单编号" prop="formNo">
-              <el-input v-model.trim="ruleForm.formNo" placeholder="系统自动生成" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="表单名称" prop="formName">
-              <el-input v-model.trim="ruleForm.formName" placeholder="表单名称" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="单位" props="senderName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="单位" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门">
-              <el-input v-model.trim="ruleForm.customerDeptName" placeholder="部门" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="申诉人" prop="appealUserName">
-              <el-input v-model.trim="ruleForm.appealUserName" placeholder="申诉人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建人" prop="createUserName">
-              <el-input v-model.trim="ruleForm.createUserName" placeholder="创建人" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间" prop="createTime">
-              <el-input v-model.trim="ruleForm.createTime" placeholder="创建时间" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+    <detail-block-com v-if="statusName !== '草稿箱' && $route.path.includes('detail')">
+      <el-radio-group v-model="activeName">
+        <el-radio-button label="基本信息">
+          基本信息
+        </el-radio-button>
+        <el-radio-button label="审批详情">
+          审批详情
+        </el-radio-button>
+      </el-radio-group>
     </detail-block-com>
-    <detail-block-com>
-      <detail-block-switch title="意见内容">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="1" />
-          <el-col :span="22">
-            <el-input
-              v-model.trim="ruleForm.suggestContent" :rows="4" :disabled="$route.path.includes('detail')"
-              type="textarea" placeholder="意见内容"
-            />
-          </el-col>
-          <el-col :span="1" />
-        </el-row>
-      </detail-block-switch>
-    </detail-block-com>
+    <template v-if="activeName === '基本信息'">
+      <detail-block-com>
+        <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="文件编号" prop="formNo">
+                <el-input v-model.trim="ruleForm.formNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标题" prop="formName">
+                <el-input v-model.trim="ruleForm.formName" placeholder="标题" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="单位" props="senderName">
+                <el-input v-model.trim="ruleForm.customerName" placeholder="单位" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="部门">
+                <el-input v-model.trim="ruleForm.customerDeptName" placeholder="部门" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="申诉人" prop="appealUserName">
+                <el-input v-model.trim="ruleForm.appealUserName" placeholder="申诉人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建人" prop="createUserName">
+                <el-input v-model.trim="ruleForm.createUserName" placeholder="创建人" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间" prop="createTime">
+                <el-input v-model.trim="ruleForm.createTime" placeholder="创建时间" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实验室代码" prop="labCode">
+                <!-- <el-input v-model.trim="ruleForm.labCode" placeholder="创建时间" disabled /> -->
+                <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                  <el-option
+                    v-for="item in labCodeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <detail-block-switch title="意见内容">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="1" />
+            <el-col :span="22">
+              <el-input
+                v-model.trim="ruleForm.suggestContent" :rows="4" :disabled="$route.path.includes('detail')"
+                type="textarea" placeholder="意见内容"
+              />
+            </el-col>
+            <el-col :span="1" />
+          </el-row>
+        </detail-block-switch>
+      </detail-block-com>
+    </template>
+    <approval-record-table v-if="activeName === '审批详情'" :process-id="ruleForm.processId" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
new file mode 100644
index 0000000..b914ef1
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -0,0 +1,408 @@
+<!-- 委托方意见登记表 -->
+<script lang="ts" setup name="ClientOpinionForm">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import ApprovalDialog from './ApprovalDialog.vue'
+import { cancelOpinion, delOpinion, getListPage, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getDictByCode } from '@/api/system/dict'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+const $props = defineProps({
+  statusName: {
+    type: String,
+    default: '',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const applyDict = ref<{ [key: string]: string }>({
+  审批: '',
+  草稿箱: '1',
+  审批中: '3',
+  已通过: '4',
+  未通过: '5',
+  已取消: '6',
+})
+const listQuery = reactive({
+  approvalStatus: '0',
+  createTimeEnd: '',
+  createTimeStart: '',
+  // createUserName: '',
+  // customerDeptName: '',
+  // customerName: '',
+  customerId: '',
+  customerDeptId: '',
+  handleStatus: '',
+  formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL,
+  formNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 证书有效期开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'formNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'formName',
+    align: 'center',
+  },
+  {
+    text: '单位',
+    value: 'customerName',
+    align: 'center',
+  },
+  {
+    text: '部门',
+    value: 'customerDeptName',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage(listQuery, $props.statusName).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+// 审批状态发生变化
+watch(() => $props.statusName, (newVal) => {
+  if (newVal) {
+    listQuery.handleStatus = ''
+    listQuery.approvalStatus = applyDict.value[newVal] as string
+    fetchData()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.formNo = ''
+  // listQuery.createUserName = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.customerId = ''
+  listQuery.customerDeptId = ''
+  listQuery.handleStatus = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+// const handler = (row: any, type: string) => {
+//   $router.push({
+//     path: `/opinion/${type}`,
+//     query: {
+//       row: JSON.stringify(row),
+//       id: row.id,
+//     },
+//   })
+// }
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitOpinion({ id: row.id, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 取消
+const canHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelOpinion({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      // close()
+      search()
+    })
+  })
+}
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `opinion/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+    },
+  })
+}
+// 详情
+const detail = (row: any) => {
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: 'opinion/detail',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+      },
+    })
+  }
+}
+const permUrl = {
+  add: '/tested/business/opinion/add',
+  edit: '/tested/business/opinion/edit',
+  agree: '/tested/business/opinion/agree',
+  reject: '/tested/business/opinion/reject',
+  submit: '/tested/business/opinion/submit',
+  cancel: '/tested/business/opinion/cancel',
+  del: '/tested/business/opinion/delete',
+}
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 处置情况
+const handleStatusList = ref<{ id: string; value: string; name: string }[]>([])
+// 获取字典
+const fetchDict = () => {
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  // 处置情况
+
+  getDictByCode('eqptHandleStatus').then((res) => {
+    handleStatusList.value = res.data
+  })
+}
+fetchDict()
+// 监听单位，修改部门
+watch(() => listQuery.customerId, (newVal) => {
+  listQuery.customerDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.formNo" placeholder="文件编号" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.customerId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.customerDeptId"
+          style="width: 100%;"
+          :data="deptList"
+          :render-after-expand="false"
+          check-strictly
+          placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
+        />
+      </search-item>
+      <search-item v-if="$props.statusName === '全部'">
+        <el-select v-model="listQuery.handleStatus" clearable placeholder="处置情况">
+          <el-option v-for="item in handleStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template v-if="$props.statusName === '全部'" #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/opinion/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="审核人" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approveUserName }}
+            </template>
+          </el-table-column>
+          <el-table-column v-if="$props.statusName === '全部'" label="处置情况" align="center">
+            <template #default=" scope ">
+              {{ scope.row.handleStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column v-if="$props.statusName !== '全部'" label="审批状态" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="160" align="center">
+            <template #default=" scope ">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="primary" size="small"
+                @click="handler(scope.row, 'update')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del) && $props.statusName !== '全部'" link type="danger" size="small"
+                @click="delHandler(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 4054b67..9fce832 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -1,173 +1,80 @@
 <!-- 委托方意见登记表 -->
-<script lang="ts" setup name="ClientOpinionForm">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { delOpinion, getListPage } from '@/api/eqpt/MeasurementBusiness/opinion'
-const { proxy } = getCurrentInstance() as any
-const listQuery = reactive({
-  approvalStatus: '0',
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
-  customerDeptName: '',
-  customerName: '',
-  formId: '',
-  formNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 证书有效期开始结束时间
-const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
-    }
-  }
-})
-const columns = ref([
-  {
-    text: '表单编号',
-    value: 'formNo',
-    align: 'center',
-  },
-  {
-    text: '单位',
-    value: 'customerName',
-    align: 'center',
-  },
-  {
-    text: '部门',
-    value: 'customerDeptName',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    align: 'center',
-  },
+<script lang="ts" setup name="DeviceInfo">
+import infoList from './components/list.vue'
+import { getDictByCode } from '@/api/system/dict'
+// export interface menuType {
+//   name: string
+//   comp: any
+// }
+const menu = ref<any[]>([
+  { name: '全部', com: infoList, status: '0' },
+  { name: '已审批', com: infoList, status: '0' },
+  { name: '待审批', com: infoList, status: '1' },
+  { name: '审批', com: infoList, status: '2' },
+  { name: '草稿箱', com: infoList, status: '0' },
+  { name: '审批中', com: infoList, status: '0' },
+  { name: '已通过', com: infoList, status: '3' },
+  { name: '未通过', com: infoList, status: '4' },
+  { name: '已取消', com: infoList, status: '4' },
 ])
-const list = ref([])
-const total = ref(0)
-const listLoading = ref(true)
-
-// 获取数据
-const fetchData = (isNowPage = true) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getListPage(listQuery).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-fetchData()
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 重置
-const reset = () => {
-  datetimerange.value = []
-  listQuery.formNo = ''
-  listQuery.createUserName = ''
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  $router.push({
-    path: `/opinion/${type}`,
-    query: {
-      row: JSON.stringify(row),
-      id: row.id,
-    },
-  })
-}
-const delFun = (row: any) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
-      ElMessage.success('操作成功')
-      search()
+const current = ref('')
+const com = shallowRef(infoList)
+const currentApprovalStatus = ref('0')
+const approvalStatusMap = ref({}) as any
+const approvalStatusReserveMap = ref({}) as any
+// 获取菜单状态
+const getMenuStatus = () => {
+  getDictByCode('approvalStatus').then((res) => {
+    // 审批状态字典 {1：草稿箱}
+    res.data.forEach((item: any) => {
+      approvalStatusMap.value[`${item.value}`] = item.name
     })
+    // 审批状态字典 {草稿箱: 1}
+    res.data.forEach((item: any) => {
+      approvalStatusReserveMap.value[item.name] = `${item.value}`
+    })
+    // console.log(approvalStatusReserveMap.value)
   })
 }
+
+watch(current, (newValue) => {
+  window.sessionStorage.setItem('business-opinion', newValue)
+  com.value = menu.value.filter(item => item.name === newValue)[0].com
+})
+
+onMounted(async () => {
+  await getMenuStatus()
+  current.value = ''
+  current.value = window.sessionStorage.getItem('business-opinion') || '全部'
+  com.value = menu.value.filter(item => item.name === current.value)[0].com
+})
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.formNo" placeholder="表单编号" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/tested/business/opinion/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-      </template>
-      <!-- 普通表格 -->
-      <normal-table
-        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="160" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
-                查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm('/tested/business/opinion/delete')" link type="danger" size="small" @click="delFun(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="com" :status-name="current" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 68px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index 1aad1c4..0a13174 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -13,6 +14,7 @@
   formNo: '',
   groupCode: '',
   labCode: '',
+  measureItem: '',
   offset: 1,
   limit: 20,
 })
@@ -30,23 +32,28 @@
 })
 const columns = ref([
   {
-    text: '评审表编号',
+    text: '文件编号',
     value: 'formNo',
     align: 'center',
   },
+  // {
+  //   text: '文件名称',
+  //   value: 'formName',
+  //   align: 'center',
+  // },
   {
-    text: '评审表名称',
-    value: 'formName',
+    text: '实验室',
+    value: 'labCodeName',
     align: 'center',
   },
   {
-    text: '实验室代码',
-    value: 'labCode',
+    text: '专业组',
+    value: 'groupCodeName',
     align: 'center',
   },
   {
-    text: '组别代码',
-    value: 'groupCode',
+    text: '测试、校准或检定项目',
+    value: 'measureItem',
     align: 'center',
   },
   {
@@ -54,11 +61,11 @@
     value: 'signStatusName',
     align: 'center',
   },
-  {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
     text: '创建时间',
     value: 'createTime',
@@ -97,6 +104,7 @@
   listQuery.formNo = ''
   listQuery.groupCode = ''
   listQuery.labCode = ''
+  listQuery.measureItem = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -122,6 +130,18 @@
     },
   })
 }
+// 获取字典
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+const groupCodeList = ref<{ id: string; value: string; name: string }[]>()
+const fetchDict = () => {
+  getDictByCode('bizLabCode').then((res) => {
+    labCodeList.value = res.data
+  })
+  getDictByCode('bizGroupCode').then((res) => {
+    groupCodeList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -129,15 +149,35 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.formNo" placeholder="评审表编号" clearable />
+        <el-input v-model.trim="listQuery.formNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.labCode" placeholder="实验室代码" clearable />
+        <!-- <el-input v-model.trim="listQuery.labCode" placeholder="实验室" clearable /> -->
+        <el-select v-model="listQuery.labCode" filterable placeholder="实验室" style="width: 100%;">
+          <el-option
+            v-for="item in labCodeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.groupCode" placeholder="组别代码" clearable />
+        <el-select v-model="listQuery.groupCode" filterable placeholder="专业组" style="width: 100%;">
+          <el-option
+            v-for="item in groupCodeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+        <!-- <el-input v-model.trim="listQuery.groupCode" placeholder="专业组" clearable /> -->
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.measureItem" placeholder="测试、校准或检定项目" clearable />
+      </search-item>
+
+      <search-item>
         <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 6b482d3..d26a59f 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -67,11 +67,13 @@
   else {
     // 获取当前用户单位
     getUserDept().then((res) => {
-      // ruleForm.value.customerName = res.data.fullName
-      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.customerName = res.data.fullName
+      ruleForm.value.customerId = res.data.id
       ruleForm.value.senderName = userStore.name
       ruleForm.value.senderId = userStore.id
       ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+      ruleForm.value.writerName = userStore.name
+      ruleForm.value.writerId = userStore.id
     })
   }
 }
@@ -149,20 +151,20 @@
   // 显示筛选填写用户和单位的弹窗
   refFilterCustomer.value.showOrHideFilterDialog(true)
 }
-const confirmPerson = (row: any) => {
-  refFilterCustomer.value.showOrHideFilterDialog(false)
-  // console.log(row, 'row')
-  ruleForm.value.customerName = row.deptName
-  ruleForm.value.customerId = row.deptId
-  ruleForm.value.writerName = row.name
-  ruleForm.value.writerId = row.id
-}
+// const confirmPerson = (row: any) => {
+//   refFilterCustomer.value.showOrHideFilterDialog(false)
+//   // console.log(row, 'row')
+//   ruleForm.value.customerName = row.deptName
+//   ruleForm.value.customerId = row.deptId
+//   ruleForm.value.writerName = row.name
+//   ruleForm.value.writerId = row.id
+// }
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 用户弹窗 -->
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
+    <!-- <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" /> -->
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -200,12 +202,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
-                <template #append>
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled>
+                <!-- <template #append>
                   <el-button type="primary" @click="selectPerson">
                     选择
                   </el-button>
-                </template>
+                </template> -->
               </el-input>
             </el-form-item>
           </el-col>

diff --git a/package.json b/package.json
index e604682..9976612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.1",
-    "pdfjs-dist": "2.0.943",
+    "pdfjs-dist": "^2.0.943",
     "pinia": "^2.0.23",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.1",
diff --git a/src/api/eqpt/MeasurementBusiness/opinion.ts b/src/api/eqpt/MeasurementBusiness/opinion.ts
index 3cac549..45de01f 100644
--- a/src/api/eqpt/MeasurementBusiness/opinion.ts
+++ b/src/api/eqpt/MeasurementBusiness/opinion.ts
@@ -4,12 +4,40 @@
 import request from '@/api/index'
 
 // 列表
-export function getListPage(data: any) {
-  return request({
-    url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
-    method: 'post',
-    data,
-  })
+export function getListPage(params: any, statusName: string) {
+  // return request({
+  //   url: `/resource/customer/suggestForm/listPage?limit=${data.limit}&offset=${data.offset}`,
+  //   method: 'post',
+  //   data,
+  // })
+  if (statusName === '全部') {
+    return request({
+      url: `/resource/customer/suggestForm/allPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '已审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/approvedListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else if (statusName === '待审批') {
+    return request({
+      url: `/resource/customer/suggestForm/approval/toApprovalListPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
+  else {
+    return request({
+      url: `/resource/customer/suggestForm/approval/listPage?limit=${params.limit}&offset=${params.offset}`,
+      method: 'post',
+      data: params,
+    })
+  }
 }
 // 新建
 export function addOpinion(data: object) {
@@ -20,9 +48,33 @@
   })
 }
 // 删除
-export function delOpinion(data: object) {
+export function delOpinion(data: any) {
   return request({
-    url: '/resource/customer/suggestForm/delete',
+    url: `/resource/customer/suggestForm/approval/delete?id=${data.id}`,
+    method: 'post',
+    // data,
+  })
+}
+// 审批操作
+export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) {
+  return request({
+    url: `/resource/customer/suggestForm/approval/${type}`,
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/submit',
+    method: 'post',
+    data,
+  })
+}
+// 取消
+export function cancelOpinion(data: object) {
+  return request({
+    url: '/resource/customer/suggestForm/approval/cancel',
     method: 'post',
     data,
   })
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index 920b802..b1ac5fa 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -15,4 +15,5 @@
   EQUIPMENT_SCRAP_APPROVAL = 'sbbfsq', // 设备报废申请
   EQUIPMENT_DELAY_APPROVAL = 'sbyysq', // 设备延用申请
   METERING_TASK_APPROVAL = 'rwdgl', // 计量计划-任务单
+  CUSTOMER_OPINION_APPROVAL = 'jlywwtfyjdjb', // 委托方意见登记表
 }
diff --git a/src/views/tested/MeasurementBusiness/detection/components/detail.vue b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
index 5773128..b4bfa1b 100644
--- a/src/views/tested/MeasurementBusiness/detection/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/detection/components/detail.vue
@@ -4,9 +4,11 @@
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import pdfFile from './pdfFile.vue'
 import { printPdf } from '@/utils/printUtils'
 import { printPage } from '@/api/eqpt/MeasurementBusiness/detection'
 import { exportFile, printContent } from '@/utils/exportUtils'
+import { getFiles } from '@/utils/download'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -62,29 +64,52 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: $route.query.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    printPdf(res.data)
-    // exportFile(res.data, '123.pdf')
+// const print = () => {
+//   printPage({ id: $route.query.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     printPdf(res.data)
+//     // exportFile(res.data, '123.pdf')
+//   })
+// }
+// 打印
+// const printObj = ref({
+//   id: 'form', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
 // 打印
-const printObj = ref({
-  id: 'form', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`检测结果复查通知单-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -96,13 +121,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -118,7 +143,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
new file mode 100644
index 0000000..1de13fb
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/detection/components/pdfFile.vue
@@ -0,0 +1,46 @@
+<!-- 文件预览组件 -->
+<script lang="ts" setup name="FilePreview">
+import VuePdfEmbed from 'vue-pdf-embed'
+import * as pdfjsLib from 'pdfjs-dist'
+import { ElLoading } from 'element-plus'
+import { getBase64, getObjectURL } from '@/utils/download'
+const emit = defineEmits(['getFile'])
+
+const pdfUrl = ref('')
+
+/**
+ * 初始化
+ */
+function init() {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...',
+    background: 'rgba(255, 255, 255, 0.6)',
+  })
+  emit('getFile', (res: any) => {
+    if (res) {
+      getBase64(res.data).then((res) => {
+        pdfUrl.value = res as string
+      })
+      pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+      loading.close()
+    }
+    else {
+      loading.close()
+    }
+  })
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<template>
+  <!-- pdf预览 -->
+  <vue-pdf-embed ref="pdf" :source="pdfUrl" class="vue-pdf-embed" />
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue
index 5af6c7f..ffc8b7c 100644
--- a/src/views/tested/MeasurementBusiness/detection/index.vue
+++ b/src/views/tested/MeasurementBusiness/detection/index.vue
@@ -6,44 +6,45 @@
 import { printJSON } from '@/utils/printUtils'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
+  noticeDateEnd: '',
+  noticeDateStart: '',
+  // createUserName: '',
   noticeNo: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
 // 证书有效期开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeDateEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+      listQuery.noticeDateStart = `${newVal[0]} 00:00:00`
+      listQuery.noticeDateEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
 const columns = ref([
   {
-    text: '通知单编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知单名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
+    text: '通知时间',
+    value: 'noticeDate',
     align: 'center',
   },
 ])
@@ -64,7 +65,7 @@
     listLoading.value = false
   })
 }
-fetchData()
+// fetchData()
 // 查询数据
 const search = () => {
   fetchData(false)
@@ -73,9 +74,10 @@
 // 重置
 const reset = () => {
   datetimerange.value = []
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.createUserName = ''
+  listQuery.noticeDateEnd = ''
+  listQuery.noticeDateStart = ''
+  listQuery.noticeName = ''
+  // listQuery.createUserName = ''
   listQuery.noticeNo = ''
   listQuery.offset = 1
   listQuery.limit = 20
@@ -127,12 +129,12 @@
         <el-input v-model.trim="listQuery.noticeNo" placeholder="通知单编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
       </search-item>
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/notice/components/detail.vue b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
index 3e286cf..51b35cf 100644
--- a/src/views/tested/MeasurementBusiness/notice/components/detail.vue
+++ b/src/views/tested/MeasurementBusiness/notice/components/detail.vue
@@ -6,9 +6,11 @@
 // import * as pdfjsLib from 'pdfjs-dist'
 import dayjs from 'dayjs'
 import detection from './detection.vue'
+import { getFiles } from '@/utils/download'
 import { printContent } from '@/utils/exportUtils'
 import { getPageDetail, printPage } from '@/api/eqpt/MeasurementBusiness/notice'
 import { printPdf } from '@/utils/printUtils'
+import pdfFile from '@/views/tested/MeasurementBusiness/detection/components/pdfFile.vue'
 const $route = useRoute()
 const $router = useRouter()
 const ruleFormRef = ref<FormInstance>() // from组件
@@ -72,28 +74,51 @@
   close()
 }
 // 打印
-const print = () => {
-  printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
-    // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
-    // printContent(res.data)
-    printPdf(res.data)
+// const print = () => {
+//   printPage({ id: ruleForm.value.id, pdf: true }).then((res) => {
+//     // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js'
+//     // printContent(res.data)
+//     printPdf(res.data)
+//   })
+// }
+// const printObj = ref({
+//   id: 'print-page', // 需要打印元素的id
+//   popTitle: '', // 打印配置页上方的标题
+//   extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+//   preview: false, // 是否启动预览模式，默认是false
+//   standard: '',
+//   extarCss: '',
+// })
+// 获取文件
+const file = ref()
+const getFile = (fun: any) => {
+  printPage({
+    id: $route.query.id,
+    pdf: true,
+  }).then((res) => {
+    file.value = res.data
+    fun(res)
+  }).catch(() => {
+    fun()
+    ElMessage.error('文件获取失败')
   })
 }
-const printObj = ref({
-  id: 'print-page', // 需要打印元素的id
-  popTitle: '', // 打印配置页上方的标题
-  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
-  preview: false, // 是否启动预览模式，默认是false
-  standard: '',
-  extarCss: '',
-})
+// 打印
+const printFile = () => {
+  if (file.value) {
+    printContent(getFiles(file.value, 'application/pdf;chartset=UTF-8'))
+  }
+  else {
+    ElMessage.warning('打印失败')
+  }
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page :title="`测试、校准或检定工作分包通知书-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-print="printObj" type="primary">
+        <el-button type="primary" @click="printFile">
           打印
         </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
@@ -105,13 +130,13 @@
       <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="通知单编号" prop="noticeNo">
-              <el-input v-model.trim="ruleForm.noticeNo" placeholder="通知单编号" disabled />
+            <el-form-item label="文件编号" prop="noticeNo">
+              <el-input v-model.trim="ruleForm.noticeNo" placeholder="文件编号" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="通知单名称" prop="noticeName">
-              <el-input v-model.trim="ruleForm.noticeName" placeholder="通知单名称" disabled />
+            <el-form-item label="文件名称" prop="noticeName">
+              <el-input v-model.trim="ruleForm.noticeName" placeholder="文件名称" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -122,7 +147,8 @@
         </el-row>
       </el-form>
     </detail-block-com>
-    <detail-block-com><detection :data="ruleForm" /></detail-block-com>
+    <!-- <detail-block-com><detection :data="ruleForm" /></detail-block-com> -->
+    <pdf-file @get-file="getFile" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/notice/index.vue b/src/views/tested/MeasurementBusiness/notice/index.vue
index 2d74eac..abf2930 100644
--- a/src/views/tested/MeasurementBusiness/notice/index.vue
+++ b/src/views/tested/MeasurementBusiness/notice/index.vue
@@ -12,7 +12,9 @@
   customerName: '',
   formId: '',
   noticeNo: '',
+  outsourceItem: '',
   outsourcerName: '',
+  noticeName: '',
   offset: 1,
   limit: 20,
 })
@@ -30,17 +32,17 @@
 })
 const columns = ref([
   {
-    text: '通知书编号',
+    text: '文件编号',
     value: 'noticeNo',
     align: 'center',
   },
   {
-    text: '通知书名称',
+    text: '文件名称',
     value: 'noticeName',
     align: 'center',
   },
   {
-    text: '受检单位名称',
+    text: '委托单位',
     value: 'customerName',
     align: 'center',
   },
@@ -50,10 +52,15 @@
     align: 'center',
   },
   {
-    text: '申请人',
-    value: 'createUserName',
+    text: '分包项目',
+    value: 'outsourceItem',
     align: 'center',
   },
+  // {
+  //   text: '申请人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
 
   {
     text: '申请时间',
@@ -91,6 +98,8 @@
   listQuery.applicantTimeStart = ''
   listQuery.approvalStatus = ''
   listQuery.customerName = ''
+  listQuery.outsourceItem = ''
+  listQuery.noticeName = ''
   listQuery.formId = ''
   listQuery.noticeNo = ''
   listQuery.outsourcerName = ''
@@ -126,21 +135,27 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.noticeNo" placeholder="通知书编号" clearable />
+        <el-input v-model.trim="listQuery.noticeNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.customerName" placeholder="受检单位名称" clearable />
+        <el-input v-model.trim="listQuery.noticeName" placeholder="文件名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.customerName" placeholder="委托单位" clearable />
       </search-item>
       <search-item>
         <el-input v-model.trim="listQuery.outsourcerName" placeholder="分包方名称" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+        <el-input v-model.trim="listQuery.outsourceItem" placeholder="分包项目" clearable />
       </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.applicantName" placeholder="申请人" clearable />
+      </search-item> -->
       <search-item>
         <el-date-picker
           v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="申请开始时间" end-placeholder="申请结束时间"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="通知开始时间" end-placeholder="通知结束时间"
           clearable
         />
       </search-item>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
new file mode 100644
index 0000000..8f76d0b
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/opinion/components/ApprovalDialog.vue
@@ -0,0 +1,172 @@
+<script lang="ts" setup name="ApprovalDialog">
+import type { FormInstance, FormRules } from 'element-plus'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import useUserStore from '@/store/modules/user'
+import { handlerApproval } from '@/api/eqpt/MeasurementBusiness/opinion'
+/**
+ * 审批弹窗
+ */
+defineProps({
+  /**
+   * 提示文字
+   */
+  title: {
+    type: String,
+    default: '审批操作',
+  },
+})
+const emit = defineEmits(['onSuccess'])
+// 弹窗显示状态
+const dialogVisible = ref(false)
+// 默认表单
+const defaultFormData = {
+  type: '', // 审批类型
+  taskId: '', // 任务id
+  comments: '', // 备注
+  user: '', // 当前用户
+  approvalTime: '', // 当前时间
+  processInstanceId: '',
+  id: '',
+}
+// 弹窗类型 agree同意 refuse拒绝 reject驳回 revoke取消
+const type = ref('agree')
+// 表单数据对象
+const formData = reactive({ ...defaultFormData })
+
+// 保存按钮加载状态
+const btnLoading = ref(false)
+
+// agree同意 refuse拒绝 reject驳回 revoke取消
+const userInfo = useUserStore()
+
+// ---------------表单提交--------------------------------
+// 表单对象
+const dataFormRef = ref<FormInstance>()
+// 校验规则
+const rules: FormRules = reactive({
+  // comments: [{ required: true, message: '审批结论必填', trigger: ['blur', 'change'] }],
+})
+/**
+ * 初始化审批弹窗
+ * @param type 审批类型
+ * @param taskId 任务id
+ */
+function initDialog(type: string, taskId: string, processInstanceId: string, id: string) {
+  formData.type = type
+  formData.taskId = taskId
+  formData.processInstanceId = processInstanceId
+  formData.id = id
+  formData.user = userInfo.name
+  formData.approvalTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
+  formData.comments = ''
+  dialogVisible.value = true
+}
+// 提交表单
+function submitForm() {
+  if (dataFormRef) {
+    dataFormRef.value?.validate((valid: boolean) => {
+      if (valid) {
+        btnLoading.value = true
+        if (formData.type) {
+          handlerApproval(formData.type, { taskId: formData.taskId, comments: formData.comments, processInstanceId: formData.processInstanceId, id: formData.id }).then((res) => {
+            ElMessage.success('审批完成')
+            btnLoading.value = false
+            dialogVisible.value = false
+            emit('onSuccess')
+          }).catch((_) => {
+            btnLoading.value = false
+          })
+        }
+      }
+    })
+  }
+}
+// 关闭弹窗
+function handleClose() {
+  dialogVisible.value = false
+}
+
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog
+    v-model="dialogVisible"
+    title="审批操作"
+    width="600"
+    :before-close="handleClose"
+  >
+    <el-form
+      ref="dataFormRef"
+      label-position="left"
+      label-width="90px"
+      :model="formData"
+      :rules="rules"
+    >
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批意见:">
+            <el-radio-group v-model="formData.type" disabled>
+              <el-radio label="agree" size="large">
+                同意
+              </el-radio>
+              <!-- <el-radio label="reject" size="large">
+                驳回
+              </el-radio> -->
+              <el-radio label="refuse" size="large">
+                拒绝
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label="审批结论:" prop="comments">
+            <el-input
+              v-model="formData.comments"
+              :rows="4"
+              show-word-limit
+              type="textarea"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="审批人:">
+            <el-input
+              v-model="formData.user"
+              placeholder="审批人"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="审批时间:">
+            <el-input
+              v-model="formData.approvalTime"
+              style="width: 100%;"
+              placeholder="审批时间"
+              disabled
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="btnLoading" @click="submitForm">
+        提交
+      </el-button>
+      <el-button type="info" @click="handleClose">
+        取消
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
index a438c2a..bb2b778 100644
--- a/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/components/edit.vue
@@ -3,14 +3,19 @@
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import ApprovalDialog from './ApprovalDialog.vue'
 import useUserStore from '@/store/modules/user'
+import { getDictByCode } from '@/api/system/dict'
 import { getUserDept } from '@/api/system/user'
-import { addOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { addOpinion, cancelOpinion, delOpinion, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { delTextBtn, editBtn, submitBtn } from '@/utils/applyBtns'
+import { SCHEDULE } from '@/utils/scheduleDict'
 const $route = useRoute()
 const $router = useRouter()
 const userStore = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
 const tableRef = ref()
+const statusName = $route.query.statusName as string
 // 显示标题
 const textMap: { [key: string]: string } = {
   update: '编辑',
@@ -44,6 +49,8 @@
 }) // 表单
 const rules = ref<FormRules>({
   appealUserName: [{ required: true, message: '申诉人', trigger: ['blur', 'change'] }],
+  labCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
+  formName: [{ required: true, message: '文件名称必填', trigger: ['blur', 'change'] }],
 }) // 表单验证规则
 // 弹窗初始化
 const initDialog = () => {
@@ -53,8 +60,8 @@
     const data = JSON.parse($route.query.row as string)
     ruleForm.value = data
   }
-  if ($route.params.type === 'update' || $route.params.type === 'create') {
-    ruleForm.value.formName = '委托方意见登记表'
+  if ($route.params.type === 'create') {
+    ruleForm.value.formName = ''
     ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
     ruleForm.value.createUserId = userStore.id
     ruleForm.value.createUserName = userStore.name
@@ -83,104 +90,269 @@
   })
 }
 // 保存
-const saveForm = async (formEl: FormInstance | undefined) => {
-  if (!formEl) { return }
-  await formEl.validate((valid, fields) => {
-    if (valid) {
-      if (!ruleForm.value.suggestContent) {
-        ElMessage.warning('请先填写意见内容')
-        return
-      }
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-        update()
-      })
-    }
-  })
-}
+// const saveForm = async (formEl: FormInstance | undefined) => {
+//   if (!formEl) { return }
+//   await formEl.validate((valid, fields) => {
+//     if (valid) {
+//       if (!ruleForm.value.suggestContent) {
+//         ElMessage.warning('请先填写意见内容')
+//         return
+//       }
+//       ElMessageBox.confirm(
+//         '确认保存吗？',
+//         '提示',
+//         {
+//           confirmButtonText: '确认',
+//           cancelButtonText: '取消',
+//           type: 'warning',
+//         },
+//       ).then((res) => {
+//         update()
+//       })
+//     }
+//   })
+// }
 // 取消
 const resetForm = (formEl: FormInstance | undefined) => {
   formEl?.resetFields()
   close()
 }
+const { proxy } = getCurrentInstance() as any
+const permUrl = ref({
+  agree: '/tested/pmetering/plan/agree',
+  reject: '/tested/pmetering/plan/reject',
+})
+// 审批
+const approvalDialogRef = ref()
+const apply = (type: string) => {
+  const data = JSON.parse($route.query.row as string)
+  approvalDialogRef.value.initDialog(type, data.taskId, data.processId, ruleForm.value.id)
+}
+// 编辑
+const editForm = () => {
+  $router.push({
+    params: { ...$route.params, type: 'update' },
+    query: { ...$route.query },
+  })
+}
+// 保存
+const submitId = ref('')
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, _fields) => {
+    ElMessageBox.confirm(
+      '确认保存吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then((_res) => {
+      if (submitId.value) {
+        ruleForm.value.id = submitId.value
+      }
+      addOpinion(ruleForm.value).then((res) => {
+        submitId.value = res.data
+        // close()
+        if (statusName === '已取消' || statusName === '未通过') {
+          submitOpinion({ id: submitId.value, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((res) => {
+            ElMessage.success('已提交')
+            close()
+          })
+        }
+        else {
+          ElMessage.success('保存成功')
+        }
+      })
+    })
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((_res) => {
+    submitOpinion({ id: submitId.value, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((_res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 删除
+const delForm = () => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
+      ElMessage.success('操作成功')
+      close()
+    })
+  })
+}
+// 取消
+const cancelForm = () => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    const row = JSON.parse($route.query.row as string)
+    cancelOpinion({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      // close()
+      close()
+    })
+  })
+}
+// 详情
+const processId = ref()
+// detailPlan(data.id).then((res) => {
+//   processId.value = res.data.processId
+//   console.log(processId.value, 'processId.value')
+// })
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+getDictByCode('bizLabCode').then((res) => {
+  labCodeList.value = res.data
+})
+const activeName = ref('基本信息')
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
     <detail-page :title="`委托方意见登记表-${textMap[dialogStatus]}`">
       <template #btns>
-        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.agree) " type="primary" @click="apply('agree')">
+          同意
+        </el-button>
+        <el-button v-if="statusName === '待审批' && proxy.hasPerm(permUrl.reject)" type="primary" @click="apply('refuse')">
+          拒绝
+        </el-button>
+        <el-button v-if="editBtn(statusName, dialogStatus)" type="primary" @click="editForm()">
+          编辑
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus) && statusName !== '已取消' && statusName !== '未通过' " type="primary" @click="submitForm()">
+          提交
+        </el-button>
+        <el-button v-if="submitBtn(statusName, dialogStatus)" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
+        <el-button v-if="delTextBtn(statusName)" type="info" @click="delForm()">
+          删除
+        </el-button>
+        <el-button v-if="statusName === '审批中'" type="info" @click="cancelForm()">
+          取消
+        </el-button>
         <el-button type="info" @click="resetForm(ruleFormRef)">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <detail-block-com>
-      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="表单编号" prop="formNo">
-              <el-input v-model.trim="ruleForm.formNo" placeholder="系统自动生成" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="表单名称" prop="formName">
-              <el-input v-model.trim="ruleForm.formName" placeholder="表单名称" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="单位" props="senderName">
-              <el-input v-model.trim="ruleForm.customerName" placeholder="单位" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="部门">
-              <el-input v-model.trim="ruleForm.customerDeptName" placeholder="部门" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
-          <el-col :span="6">
-            <el-form-item label="申诉人" prop="appealUserName">
-              <el-input v-model.trim="ruleForm.appealUserName" placeholder="申诉人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建人" prop="createUserName">
-              <el-input v-model.trim="ruleForm.createUserName" placeholder="创建人" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="创建时间" prop="createTime">
-              <el-input v-model.trim="ruleForm.createTime" placeholder="创建时间" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+    <detail-block-com v-if="statusName !== '草稿箱' && $route.path.includes('detail')">
+      <el-radio-group v-model="activeName">
+        <el-radio-button label="基本信息">
+          基本信息
+        </el-radio-button>
+        <el-radio-button label="审批详情">
+          审批详情
+        </el-radio-button>
+      </el-radio-group>
     </detail-block-com>
-    <detail-block-com>
-      <detail-block-switch title="意见内容">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="1" />
-          <el-col :span="22">
-            <el-input
-              v-model.trim="ruleForm.suggestContent" :rows="4" :disabled="$route.path.includes('detail')"
-              type="textarea" placeholder="意见内容"
-            />
-          </el-col>
-          <el-col :span="1" />
-        </el-row>
-      </detail-block-switch>
-    </detail-block-com>
+    <template v-if="activeName === '基本信息'">
+      <detail-block-com>
+        <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="文件编号" prop="formNo">
+                <el-input v-model.trim="ruleForm.formNo" placeholder="系统自动生成" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标题" prop="formName">
+                <el-input v-model.trim="ruleForm.formName" placeholder="标题" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="单位" props="senderName">
+                <el-input v-model.trim="ruleForm.customerName" placeholder="单位" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="部门">
+                <el-input v-model.trim="ruleForm.customerDeptName" placeholder="部门" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="6">
+              <el-form-item label="申诉人" prop="appealUserName">
+                <el-input v-model.trim="ruleForm.appealUserName" placeholder="申诉人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建人" prop="createUserName">
+                <el-input v-model.trim="ruleForm.createUserName" placeholder="创建人" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="创建时间" prop="createTime">
+                <el-input v-model.trim="ruleForm.createTime" placeholder="创建时间" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="实验室代码" prop="labCode">
+                <!-- <el-input v-model.trim="ruleForm.labCode" placeholder="创建时间" disabled /> -->
+                <el-select v-model="ruleForm.labCode" filterable placeholder="实验室代码" style="width: 100%;">
+                  <el-option
+                    v-for="item in labCodeList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </detail-block-com>
+      <detail-block-com>
+        <detail-block-switch title="意见内容">
+          <el-row :gutter="24" class="marg">
+            <el-col :span="1" />
+            <el-col :span="22">
+              <el-input
+                v-model.trim="ruleForm.suggestContent" :rows="4" :disabled="$route.path.includes('detail')"
+                type="textarea" placeholder="意见内容"
+              />
+            </el-col>
+            <el-col :span="1" />
+          </el-row>
+        </detail-block-switch>
+      </detail-block-com>
+    </template>
+    <approval-record-table v-if="activeName === '审批详情'" :process-id="ruleForm.processId" />
   </app-container>
 </template>
 
diff --git a/src/views/tested/MeasurementBusiness/opinion/components/list.vue b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
new file mode 100644
index 0000000..b914ef1
--- /dev/null
+++ b/src/views/tested/MeasurementBusiness/opinion/components/list.vue
@@ -0,0 +1,408 @@
+<!-- 委托方意见登记表 -->
+<script lang="ts" setup name="ClientOpinionForm">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import ApprovalDialog from './ApprovalDialog.vue'
+import { cancelOpinion, delOpinion, getListPage, submitOpinion } from '@/api/eqpt/MeasurementBusiness/opinion'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { toTreeList } from '@/utils/structure'
+import { getDeptTreeList } from '@/api/system/dept'
+import { getDictByCode } from '@/api/system/dict'
+import { getAdminDept, getUserDept, getUserDeptSon, getUserList } from '@/api/system/user'
+const $props = defineProps({
+  statusName: {
+    type: String,
+    default: '',
+  },
+})
+const { proxy } = getCurrentInstance() as any
+const applyDict = ref<{ [key: string]: string }>({
+  审批: '',
+  草稿箱: '1',
+  审批中: '3',
+  已通过: '4',
+  未通过: '5',
+  已取消: '6',
+})
+const listQuery = reactive({
+  approvalStatus: '0',
+  createTimeEnd: '',
+  createTimeStart: '',
+  // createUserName: '',
+  // customerDeptName: '',
+  // customerName: '',
+  customerId: '',
+  customerDeptId: '',
+  handleStatus: '',
+  formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL,
+  formNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 证书有效期开始结束时间
+const datetimerange = ref()
+watch(() => datetimerange.value, (newVal) => {
+  listQuery.createTimeStart = ''
+  listQuery.createTimeEnd = ''
+  if (Array.isArray(newVal)) {
+    if (newVal.length) {
+      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
+    }
+  }
+})
+const columns = ref([
+  {
+    text: '文件编号',
+    value: 'formNo',
+    align: 'center',
+  },
+  {
+    text: '标题',
+    value: 'formName',
+    align: 'center',
+  },
+  {
+    text: '单位',
+    value: 'customerName',
+    align: 'center',
+  },
+  {
+    text: '部门',
+    value: 'customerDeptName',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'createTime',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  getListPage(listQuery, $props.statusName).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    listLoading.value = false
+  })
+}
+// 审批状态发生变化
+watch(() => $props.statusName, (newVal) => {
+  if (newVal) {
+    listQuery.handleStatus = ''
+    listQuery.approvalStatus = applyDict.value[newVal] as string
+    fetchData()
+  }
+},
+{
+  deep: true,
+  immediate: true,
+})
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+// 重置
+const reset = () => {
+  datetimerange.value = []
+  listQuery.formNo = ''
+  // listQuery.createUserName = ''
+  listQuery.createTimeEnd = ''
+  listQuery.createTimeStart = ''
+  listQuery.customerId = ''
+  listQuery.customerDeptId = ''
+  listQuery.handleStatus = ''
+  listQuery.offset = 1
+  listQuery.limit = 20
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+// const handler = (row: any, type: string) => {
+//   $router.push({
+//     path: `/opinion/${type}`,
+//     query: {
+//       row: JSON.stringify(row),
+//       id: row.id,
+//     },
+//   })
+// }
+// 提交
+const submit = (row: any) => {
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitOpinion({ id: row.id, formId: SCHEDULE.CUSTOMER_OPINION_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      search()
+    })
+  })
+}
+// 同意拒绝
+const approvalDialogRef = ref()
+const approveHandler = (row: any, type: string) => {
+  approvalDialogRef.value.initDialog(type, row.taskId, row.processId, row.id)
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认删除此记录吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
+      ElMessage.success('操作成功')
+      search()
+    })
+  })
+}
+// 取消
+const canHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此申请吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    cancelOpinion({ id: row.id, processInstanceId: row.processId, comments: '' }).then((res) => {
+      ElMessage.success('操作成功')
+      // close()
+      search()
+    })
+  })
+}
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `opinion/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+      statusName: $props.statusName,
+    },
+  })
+}
+// 详情
+const detail = (row: any) => {
+  if ($props.statusName === '草稿箱' || $props.statusName === '未通过' || $props.statusName === '已取消') {
+    handler(row, 'update')
+  }
+  else {
+    $router.push({
+      path: 'opinion/detail',
+      query: {
+        row: JSON.stringify(row),
+        id: row.id,
+        statusName: $props.statusName,
+      },
+    })
+  }
+}
+const permUrl = {
+  add: '/tested/business/opinion/add',
+  edit: '/tested/business/opinion/edit',
+  agree: '/tested/business/opinion/agree',
+  reject: '/tested/business/opinion/reject',
+  submit: '/tested/business/opinion/submit',
+  cancel: '/tested/business/opinion/cancel',
+  del: '/tested/business/opinion/delete',
+}
+// 所在单位
+const companyList = ref<{ id: string; value: string; name: string }[]>([])
+// 部门
+const deptList = ref<{ id: string; value: string; name: string }[]>([])
+// 处置情况
+const handleStatusList = ref<{ id: string; value: string; name: string }[]>([])
+// 获取字典
+const fetchDict = () => {
+  getUserDept().then((res) => {
+    if (res.data.fullName === '顶级' || res.data.version === '1' || res.data.version === 1) {
+      getAdminDept({}).then((res) => {
+        companyList.value = res.data.map((item: any) => ({ id: item.id, value: item.id, name: item.fullName }))
+      })
+    }
+    else {
+      companyList.value = [
+        {
+          name: res.data.fullName,
+          value: res.data.id,
+          id: res.data.id,
+        },
+      ]
+    }
+  })
+  // 处置情况
+
+  getDictByCode('eqptHandleStatus').then((res) => {
+    handleStatusList.value = res.data
+  })
+}
+fetchDict()
+// 监听单位，修改部门
+watch(() => listQuery.customerId, (newVal) => {
+  listQuery.customerDeptId = ''
+  if (newVal) {
+    getDeptTreeList({ pid: newVal }).then((res) => {
+      deptList.value = toTreeList(res.data.map((item: any) => ({ ...item, label: item.name, value: item.id }))) as any[]
+    })
+  }
+  else {
+    deptList.value = []
+  }
+}, {
+  deep: true,
+})
+</script>
+
+<template>
+  <app-container>
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialogRef" @on-success="search" />
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.formNo" placeholder="文件编号" clearable />
+      </search-item>
+      <!-- <search-item>
+        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
+      </search-item> -->
+      <search-item>
+        <el-select v-model="listQuery.customerId" clearable filterable placeholder="所在单位">
+          <el-option v-for="item in companyList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-tree-select
+          v-model="listQuery.customerDeptId"
+          style="width: 100%;"
+          :data="deptList"
+          :render-after-expand="false"
+          check-strictly
+          placeholder="部门"
+        />
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
+          clearable
+        />
+      </search-item>
+      <search-item v-if="$props.statusName === '全部'">
+        <el-select v-model="listQuery.handleStatus" clearable placeholder="处置情况">
+          <el-option v-for="item in handleStatusList" :key="item.value" :label="item.name" :value="item.value" />
+        </el-select>
+      </search-item>
+    </search-area>
+    <table-container>
+      <template v-if="$props.statusName === '全部'" #btns-right>
+        <icon-button v-if="proxy.hasPerm('/tested/business/opinion/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
+        <!-- <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" /> -->
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column v-if="$props.statusName === '全部'" label="审核人" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approveUserName }}
+            </template>
+          </el-table-column>
+          <el-table-column v-if="$props.statusName === '全部'" label="处置情况" align="center">
+            <template #default=" scope ">
+              {{ scope.row.handleStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column v-if="$props.statusName !== '全部'" label="审批状态" align="center">
+            <template #default=" scope ">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="160" align="center">
+            <template #default=" scope ">
+              <el-button link type="primary" size="small" @click="detail(scope.row)">
+                查看
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.edit.if({ approvalStatusName: $props.statusName }, permUrl.edit) && $props.statusName !== '全部'" link type="primary" size="small"
+                @click="handler(scope.row, 'update')"
+              >
+                编辑
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.agree.if({ approvalStatusName: $props.statusName }, permUrl.agree)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'agree')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.reject.if({ approvalStatusName: $props.statusName }, permUrl.reject)" link type="primary" size="small"
+                @click="approveHandler(scope.row, 'refuse')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.submit.if({ approvalStatusName: $props.statusName }, permUrl.submit)" link type="primary" size="small"
+                @click="submit(scope.row)"
+              >
+                提交
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.cancel.if({ approvalStatusName: $props.statusName }, permUrl.cancel)" link type="primary" size="small"
+                @click="canHandler(scope.row)"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="proxy.buttonPerm.delete.if({ approvalStatusName: $props.statusName }, permUrl.del) && $props.statusName !== '全部'" link type="danger" size="small"
+                @click="delHandler(scope.row)"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
+</template>
+
diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue
index 4054b67..9fce832 100644
--- a/src/views/tested/MeasurementBusiness/opinion/index.vue
+++ b/src/views/tested/MeasurementBusiness/opinion/index.vue
@@ -1,173 +1,80 @@
 <!-- 委托方意见登记表 -->
-<script lang="ts" setup name="ClientOpinionForm">
-import { reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { delOpinion, getListPage } from '@/api/eqpt/MeasurementBusiness/opinion'
-const { proxy } = getCurrentInstance() as any
-const listQuery = reactive({
-  approvalStatus: '0',
-  createTimeEnd: '',
-  createTimeStart: '',
-  createUserName: '',
-  customerDeptName: '',
-  customerName: '',
-  formId: '',
-  formNo: '',
-  offset: 1,
-  limit: 20,
-})
-// 证书有效期开始结束时间
-const datetimerange = ref()
-watch(() => datetimerange.value, (newVal) => {
-  listQuery.createTimeStart = ''
-  listQuery.createTimeEnd = ''
-  if (Array.isArray(newVal)) {
-    if (newVal.length) {
-      listQuery.createTimeStart = `${newVal[0]} 00:00:00`
-      listQuery.createTimeEnd = `${newVal[1]} 23:59:59`
-    }
-  }
-})
-const columns = ref([
-  {
-    text: '表单编号',
-    value: 'formNo',
-    align: 'center',
-  },
-  {
-    text: '单位',
-    value: 'customerName',
-    align: 'center',
-  },
-  {
-    text: '部门',
-    value: 'customerDeptName',
-    align: 'center',
-  },
-  {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
-  {
-    text: '创建时间',
-    value: 'createTime',
-    align: 'center',
-  },
+<script lang="ts" setup name="DeviceInfo">
+import infoList from './components/list.vue'
+import { getDictByCode } from '@/api/system/dict'
+// export interface menuType {
+//   name: string
+//   comp: any
+// }
+const menu = ref<any[]>([
+  { name: '全部', com: infoList, status: '0' },
+  { name: '已审批', com: infoList, status: '0' },
+  { name: '待审批', com: infoList, status: '1' },
+  { name: '审批', com: infoList, status: '2' },
+  { name: '草稿箱', com: infoList, status: '0' },
+  { name: '审批中', com: infoList, status: '0' },
+  { name: '已通过', com: infoList, status: '3' },
+  { name: '未通过', com: infoList, status: '4' },
+  { name: '已取消', com: infoList, status: '4' },
 ])
-const list = ref([])
-const total = ref(0)
-const listLoading = ref(true)
-
-// 获取数据
-const fetchData = (isNowPage = true) => {
-  listLoading.value = true
-  if (!isNowPage) {
-    // 是否显示当前页，否则跳转第一页
-    listQuery.offset = 1
-  }
-  getListPage(listQuery).then((response) => {
-    list.value = response.data.rows
-    total.value = parseInt(response.data.total)
-    listLoading.value = false
-  })
-}
-fetchData()
-// 查询数据
-const search = () => {
-  fetchData(false)
-}
-// 重置
-const reset = () => {
-  datetimerange.value = []
-  listQuery.formNo = ''
-  listQuery.createUserName = ''
-  listQuery.createTimeEnd = ''
-  listQuery.createTimeStart = ''
-  listQuery.offset = 1
-  listQuery.limit = 20
-  search()
-}
-// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
-const changePage = (val: { size: number; page: number }) => {
-  if (val && val.size) {
-    listQuery.limit = val.size
-  }
-  if (val && val.page) {
-    listQuery.offset = val.page
-  }
-  fetchData()
-}
-const $router = useRouter()
-// 新建编辑操作
-const handler = (row: any, type: string) => {
-  $router.push({
-    path: `/opinion/${type}`,
-    query: {
-      row: JSON.stringify(row),
-      id: row.id,
-    },
-  })
-}
-const delFun = (row: any) => {
-  ElMessageBox.confirm(
-    '确认删除吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then((res) => {
-    delOpinion({ id: row.id, taskId: row.taskId }).then((res) => {
-      ElMessage.success('操作成功')
-      search()
+const current = ref('')
+const com = shallowRef(infoList)
+const currentApprovalStatus = ref('0')
+const approvalStatusMap = ref({}) as any
+const approvalStatusReserveMap = ref({}) as any
+// 获取菜单状态
+const getMenuStatus = () => {
+  getDictByCode('approvalStatus').then((res) => {
+    // 审批状态字典 {1：草稿箱}
+    res.data.forEach((item: any) => {
+      approvalStatusMap.value[`${item.value}`] = item.name
     })
+    // 审批状态字典 {草稿箱: 1}
+    res.data.forEach((item: any) => {
+      approvalStatusReserveMap.value[item.name] = `${item.value}`
+    })
+    // console.log(approvalStatusReserveMap.value)
   })
 }
+
+watch(current, (newValue) => {
+  window.sessionStorage.setItem('business-opinion', newValue)
+  com.value = menu.value.filter(item => item.name === newValue)[0].com
+})
+
+onMounted(async () => {
+  await getMenuStatus()
+  current.value = ''
+  current.value = window.sessionStorage.getItem('business-opinion') || '全部'
+  com.value = menu.value.filter(item => item.name === current.value)[0].com
+})
 </script>
 
 <template>
-  <app-container>
-    <!-- 筛选条件 -->
-    <search-area :need-clear="true" @search="search" @clear="reset">
-      <search-item>
-        <el-input v-model.trim="listQuery.formNo" placeholder="表单编号" clearable />
-      </search-item>
-      <search-item>
-        <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="datetimerange" type="daterange" value-format="YYYY-MM-DD"
-          format="YYYY-MM-DD" range-separator="至" start-placeholder="创建开始时间" end-placeholder="创建结束时间"
-          clearable
-        />
-      </search-item>
-    </search-area>
-    <table-container>
-      <template #btns-right>
-        <icon-button v-if="proxy.hasPerm('/tested/business/opinion/add')" icon="icon-add" title="新增" @click="handler({}, 'create')" />
-      </template>
-      <!-- 普通表格 -->
-      <normal-table
-        :data="list" :total="total" :columns="columns as any" :query="listQuery" :list-loading="listLoading"
-        :is-showmulti-select="true" @change="changePage"
-      >
-        <template #columns>
-          <el-table-column label="操作" width="160" align="center">
-            <template #default="scope">
-              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
-                查看
-              </el-button>
-              <el-button v-if="proxy.hasPerm('/tested/business/opinion/delete')" link type="danger" size="small" @click="delFun(scope.row)">
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </normal-table>
-    </table-container>
-  </app-container>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单 -->
+      <el-radio-group v-model="current">
+        <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <component :is="com" :status-name="current" />
+  </div>
 </template>
 
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: fixed;
+    top: 68px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue
index 1aad1c4..0a13174 100644
--- a/src/views/tested/MeasurementBusiness/review/index.vue
+++ b/src/views/tested/MeasurementBusiness/review/index.vue
@@ -3,6 +3,7 @@
 import { reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getListPage } from '@/api/eqpt/MeasurementBusiness/review'
+import { getDictByCode } from '@/api/system/dict'
 const { proxy } = getCurrentInstance() as any
 const listQuery = reactive({
   approvalStatus: '',
@@ -13,6 +14,7 @@
   formNo: '',
   groupCode: '',
   labCode: '',
+  measureItem: '',
   offset: 1,
   limit: 20,
 })
@@ -30,23 +32,28 @@
 })
 const columns = ref([
   {
-    text: '评审表编号',
+    text: '文件编号',
     value: 'formNo',
     align: 'center',
   },
+  // {
+  //   text: '文件名称',
+  //   value: 'formName',
+  //   align: 'center',
+  // },
   {
-    text: '评审表名称',
-    value: 'formName',
+    text: '实验室',
+    value: 'labCodeName',
     align: 'center',
   },
   {
-    text: '实验室代码',
-    value: 'labCode',
+    text: '专业组',
+    value: 'groupCodeName',
     align: 'center',
   },
   {
-    text: '组别代码',
-    value: 'groupCode',
+    text: '测试、校准或检定项目',
+    value: 'measureItem',
     align: 'center',
   },
   {
@@ -54,11 +61,11 @@
     value: 'signStatusName',
     align: 'center',
   },
-  {
-    text: '创建人',
-    value: 'createUserName',
-    align: 'center',
-  },
+  // {
+  //   text: '创建人',
+  //   value: 'createUserName',
+  //   align: 'center',
+  // },
   {
     text: '创建时间',
     value: 'createTime',
@@ -97,6 +104,7 @@
   listQuery.formNo = ''
   listQuery.groupCode = ''
   listQuery.labCode = ''
+  listQuery.measureItem = ''
   listQuery.offset = 1
   listQuery.limit = 20
   search()
@@ -122,6 +130,18 @@
     },
   })
 }
+// 获取字典
+const labCodeList = ref<{ id: string; value: string; name: string }[]>()
+const groupCodeList = ref<{ id: string; value: string; name: string }[]>()
+const fetchDict = () => {
+  getDictByCode('bizLabCode').then((res) => {
+    labCodeList.value = res.data
+  })
+  getDictByCode('bizGroupCode').then((res) => {
+    groupCodeList.value = res.data
+  })
+}
+fetchDict()
 </script>
 
 <template>
@@ -129,15 +149,35 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.formNo" placeholder="评审表编号" clearable />
+        <el-input v-model.trim="listQuery.formNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.labCode" placeholder="实验室代码" clearable />
+        <!-- <el-input v-model.trim="listQuery.labCode" placeholder="实验室" clearable /> -->
+        <el-select v-model="listQuery.labCode" filterable placeholder="实验室" style="width: 100%;">
+          <el-option
+            v-for="item in labCodeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
       </search-item>
       <search-item>
-        <el-input v-model.trim="listQuery.groupCode" placeholder="组别代码" clearable />
+        <el-select v-model="listQuery.groupCode" filterable placeholder="专业组" style="width: 100%;">
+          <el-option
+            v-for="item in groupCodeList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.value"
+          />
+        </el-select>
+        <!-- <el-input v-model.trim="listQuery.groupCode" placeholder="专业组" clearable /> -->
       </search-item>
       <search-item>
+        <el-input v-model.trim="listQuery.measureItem" placeholder="测试、校准或检定项目" clearable />
+      </search-item>
+
+      <search-item>
         <el-input v-model.trim="listQuery.createUserName" placeholder="创建人" clearable />
       </search-item>
       <search-item>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
index 6b482d3..d26a59f 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/components/edit.vue
@@ -67,11 +67,13 @@
   else {
     // 获取当前用户单位
     getUserDept().then((res) => {
-      // ruleForm.value.customerName = res.data.fullName
-      // ruleForm.value.customerId = res.data.id
+      ruleForm.value.customerName = res.data.fullName
+      ruleForm.value.customerId = res.data.id
       ruleForm.value.senderName = userStore.name
       ruleForm.value.senderId = userStore.id
       ruleForm.value.sendTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+      ruleForm.value.writerName = userStore.name
+      ruleForm.value.writerId = userStore.id
     })
   }
 }
@@ -149,20 +151,20 @@
   // 显示筛选填写用户和单位的弹窗
   refFilterCustomer.value.showOrHideFilterDialog(true)
 }
-const confirmPerson = (row: any) => {
-  refFilterCustomer.value.showOrHideFilterDialog(false)
-  // console.log(row, 'row')
-  ruleForm.value.customerName = row.deptName
-  ruleForm.value.customerId = row.deptId
-  ruleForm.value.writerName = row.name
-  ruleForm.value.writerId = row.id
-}
+// const confirmPerson = (row: any) => {
+//   refFilterCustomer.value.showOrHideFilterDialog(false)
+//   // console.log(row, 'row')
+//   ruleForm.value.customerName = row.deptName
+//   ruleForm.value.customerId = row.deptId
+//   ruleForm.value.writerName = row.name
+//   ruleForm.value.writerId = row.id
+// }
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <!-- 用户弹窗 -->
-    <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" />
+    <!-- <filter-customer-staff ref="refFilterCustomer" title="请选择填写单位和填写人" @record-selected="confirmPerson" /> -->
     <detail-page :title="`委托方满意度调查表-${textMap[dialogStatus]}`">
       <template #btns>
         <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
@@ -200,12 +202,12 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="填写人" prop="writerName">
-              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" :disabled="$route.path.includes('detail')">
-                <template #append>
+              <el-input v-model.trim="ruleForm.writerName" placeholder="填写人" disabled>
+                <!-- <template #append>
                   <el-button type="primary" @click="selectPerson">
                     选择
                   </el-button>
-                </template>
+                </template> -->
               </el-input>
             </el-form-item>
           </el-col>
diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
index 5466a07..238bbd6 100644
--- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue
+++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue
@@ -25,7 +25,7 @@
 })
 const columns = ref([
   {
-    text: '表单编号',
+    text: '文件编号',
     value: 'questionnaireNo',
     align: 'center',
   },