diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
new file mode 100644
index 0000000..bbf753f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -0,0 +1,187 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getStandardList } from '@/api/device/standard'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  category: '', // 类别
+  id: '',
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
+})
+const loadingTable = ref<boolean>(false)
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+}
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<columnsType[]>([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    align: 'center',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '标准等级',
+    value: 'standardLevelName',
+    align: 'center',
+  },
+  {
+    text: '传递范围',
+    value: 'transmitRangeName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  }])
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStandardList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    category: '', // 类别
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
new file mode 100644
index 0000000..bbf753f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -0,0 +1,187 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getStandardList } from '@/api/device/standard'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  category: '', // 类别
+  id: '',
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
+})
+const loadingTable = ref<boolean>(false)
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+}
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<columnsType[]>([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    align: 'center',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '标准等级',
+    value: 'standardLevelName',
+    align: 'center',
+  },
+  {
+    text: '传递范围',
+    value: 'transmitRangeName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  }])
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStandardList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    category: '', // 类别
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 9a9c992..7e02e2f 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -1,129 +1,145 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
+import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const props = defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-
 // 查询条件
 const listQuery = ref({
-  name: '', // 姓名
+  certificateStatus: '', // 姓名
+  major: '',
+  name: '',
+  staffNo: '',
+  verifierCertificateNo: '',
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
 })
 const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
+const columns = ref([
   {
-    text: '设备名称',
+    text: '姓名',
     value: 'name',
-    align: 'center',
   },
   {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
+    text: '人员编号',
+    value: 'staffNo',
   },
   {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
+    text: '所在部门',
+    value: 'deptId',
   },
   {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
+    text: '行政职务',
+    value: 'administrationJob',
   },
 ])
-const list = ref<object[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = res.data.total
+    }
+  })
+}
 // 搜索
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  fetchData()
 }
-const changePage = (e: any) => {
-  console.log(e)
-}
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
-    name: '', // 姓名
+    certificateStatus: '', // 姓名
+    major: '',
+    name: '',
+    staffNo: '',
+    verifierCertificateNo: '',
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
   }
-  list.value = props.list
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
   }
 }
-// 监听数据变化
-watch(
-  [() => props.list], ([newNums], [oldNums]) => {
-    list.value = newNums
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :pagination="false"
+        :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
@@ -131,6 +147,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
         </template>
       </normal-table>
     </div>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
new file mode 100644
index 0000000..bbf753f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -0,0 +1,187 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getStandardList } from '@/api/device/standard'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  category: '', // 类别
+  id: '',
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
+})
+const loadingTable = ref<boolean>(false)
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+}
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<columnsType[]>([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    align: 'center',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '标准等级',
+    value: 'standardLevelName',
+    align: 'center',
+  },
+  {
+    text: '传递范围',
+    value: 'transmitRangeName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  }])
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStandardList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    category: '', // 类别
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 9a9c992..7e02e2f 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -1,129 +1,145 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
+import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const props = defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-
 // 查询条件
 const listQuery = ref({
-  name: '', // 姓名
+  certificateStatus: '', // 姓名
+  major: '',
+  name: '',
+  staffNo: '',
+  verifierCertificateNo: '',
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
 })
 const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
+const columns = ref([
   {
-    text: '设备名称',
+    text: '姓名',
     value: 'name',
-    align: 'center',
   },
   {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
+    text: '人员编号',
+    value: 'staffNo',
   },
   {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
+    text: '所在部门',
+    value: 'deptId',
   },
   {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
+    text: '行政职务',
+    value: 'administrationJob',
   },
 ])
-const list = ref<object[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = res.data.total
+    }
+  })
+}
 // 搜索
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  fetchData()
 }
-const changePage = (e: any) => {
-  console.log(e)
-}
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
-    name: '', // 姓名
+    certificateStatus: '', // 姓名
+    major: '',
+    name: '',
+    staffNo: '',
+    verifierCertificateNo: '',
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
   }
-  list.value = props.list
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
   }
 }
-// 监听数据变化
-watch(
-  [() => props.list], ([newNums], [oldNums]) => {
-    list.value = newNums
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :pagination="false"
+        :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
@@ -131,6 +147,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 0b15289..07b439b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,10 +3,12 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../../standard_interface'
+import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: {
     type: String,
@@ -140,7 +142,7 @@
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
   organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
   category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
@@ -157,34 +159,20 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-const fileRef = ref() // 文件上传input
-const upload = () => {
-  fileRef.value.click()
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 标准实验室发生改变row类型
 interface rowReturn {
   phone: string
   director: string
+  name: string
+  organizeName: string
+  id: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
+// 实验室ref
+const laboratorydialog = ref()
+// 标准实验室点击
+const changeDeptList = () => {
+  laboratorydialog.value.initDialog()
 }
 // 标准实验室清空时
 const clearDeptList = () => {
@@ -205,6 +193,24 @@
 if (props.buttonType !== 'add') {
   getInfo()
 }
+// 计量人员组件
+const personListdialog = ref()
+// 点击选择负责人函数
+const personClick = () => {
+  personListdialog.value.initDialog()
+}
+// 选择负责人回调函数
+const personListAdd = (data: rowReturn) => {
+  formInline.value.standardOwner = data.id
+  formInline.value.standardOwnerName = data.name
+}
+// 选择完科室的回调函数
+const laboratoryListAdd = (data: rowReturn) => {
+  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratoryName = data.organizeName
+  formInline.value.laboratoryOwner = data.director
+  formInline.value.laboratoryOwnerContact = data.phone
+}
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -222,18 +228,17 @@
     <div class="info-content">
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
+                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -243,9 +248,10 @@
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model.trim="formInline.standardName"
-                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -253,9 +259,10 @@
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入项目编号'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -263,21 +270,23 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标项目'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入组织机构代码'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -288,49 +297,52 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标单位名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
-                size="default"
+            <el-form-item label="标准负责人:" prop="standardOwnerName">
+              <el-input
+                v-model.trim="formInline.standardOwnerName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="personClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
                 v-model="formInline.category"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择类别'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -340,6 +352,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -349,7 +362,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准等级'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -359,6 +372,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -368,7 +382,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择传递范围'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -377,6 +391,7 @@
                   v-for="item in transmitRangeList"
                   :key="item.id"
                   :label="item.name"
+                  clearable
                   :value="item.value"
                 />
               </el-select>
@@ -386,55 +401,57 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
+                type="date"
                 :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准科室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
-                size="default"
+              <el-input
+                v-model.trim="formInline.standardLaboratoryName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
-                @clear="clearDeptList"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeDeptList"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -442,20 +459,21 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
                 v-model.trim="formInline.managerState"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择管理状态'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -465,6 +483,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -474,7 +493,7 @@
               <el-select
                 v-model.trim="formInline.measureMajor"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择计量专业'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -484,6 +503,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -492,9 +512,10 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入考核单位'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -502,64 +523,67 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
-                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="2">
             <el-form-item label="环境条件" />
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
+            <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
+            <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
@@ -576,7 +600,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -592,7 +616,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input :placeholder="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -608,25 +632,25 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
+        <!-- <el-row :gutter="24">
           <el-col :span="3">
             <el-form-item label="附件:">
               <show-photo :minio-file-name="formInline.minioFileName" />
               <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
                 {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -634,6 +658,8 @@
       </el-form>
     </div>
   </app-container>
+  <person-list-dialog ref="personListdialog" @add="personListAdd" />
+  <laboratory-dialog ref="laboratorydialog" @add="laboratoryListAdd" />
 </template>
 
 <style lang="scss" scoped>
@@ -659,8 +685,4 @@
   border-radius: 10px;
   background-color: #fff;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
 </style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
new file mode 100644
index 0000000..bbf753f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -0,0 +1,187 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getStandardList } from '@/api/device/standard'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  category: '', // 类别
+  id: '',
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
+})
+const loadingTable = ref<boolean>(false)
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+}
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<columnsType[]>([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    align: 'center',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '标准等级',
+    value: 'standardLevelName',
+    align: 'center',
+  },
+  {
+    text: '传递范围',
+    value: 'transmitRangeName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  }])
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStandardList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    category: '', // 类别
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 9a9c992..7e02e2f 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -1,129 +1,145 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
+import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const props = defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-
 // 查询条件
 const listQuery = ref({
-  name: '', // 姓名
+  certificateStatus: '', // 姓名
+  major: '',
+  name: '',
+  staffNo: '',
+  verifierCertificateNo: '',
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
 })
 const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
+const columns = ref([
   {
-    text: '设备名称',
+    text: '姓名',
     value: 'name',
-    align: 'center',
   },
   {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
+    text: '人员编号',
+    value: 'staffNo',
   },
   {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
+    text: '所在部门',
+    value: 'deptId',
   },
   {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
+    text: '行政职务',
+    value: 'administrationJob',
   },
 ])
-const list = ref<object[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = res.data.total
+    }
+  })
+}
 // 搜索
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  fetchData()
 }
-const changePage = (e: any) => {
-  console.log(e)
-}
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
-    name: '', // 姓名
+    certificateStatus: '', // 姓名
+    major: '',
+    name: '',
+    staffNo: '',
+    verifierCertificateNo: '',
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
   }
-  list.value = props.list
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
   }
 }
-// 监听数据变化
-watch(
-  [() => props.list], ([newNums], [oldNums]) => {
-    list.value = newNums
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :pagination="false"
+        :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
@@ -131,6 +147,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 0b15289..07b439b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,10 +3,12 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../../standard_interface'
+import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: {
     type: String,
@@ -140,7 +142,7 @@
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
   organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
   category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
@@ -157,34 +159,20 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-const fileRef = ref() // 文件上传input
-const upload = () => {
-  fileRef.value.click()
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 标准实验室发生改变row类型
 interface rowReturn {
   phone: string
   director: string
+  name: string
+  organizeName: string
+  id: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
+// 实验室ref
+const laboratorydialog = ref()
+// 标准实验室点击
+const changeDeptList = () => {
+  laboratorydialog.value.initDialog()
 }
 // 标准实验室清空时
 const clearDeptList = () => {
@@ -205,6 +193,24 @@
 if (props.buttonType !== 'add') {
   getInfo()
 }
+// 计量人员组件
+const personListdialog = ref()
+// 点击选择负责人函数
+const personClick = () => {
+  personListdialog.value.initDialog()
+}
+// 选择负责人回调函数
+const personListAdd = (data: rowReturn) => {
+  formInline.value.standardOwner = data.id
+  formInline.value.standardOwnerName = data.name
+}
+// 选择完科室的回调函数
+const laboratoryListAdd = (data: rowReturn) => {
+  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratoryName = data.organizeName
+  formInline.value.laboratoryOwner = data.director
+  formInline.value.laboratoryOwnerContact = data.phone
+}
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -222,18 +228,17 @@
     <div class="info-content">
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
+                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -243,9 +248,10 @@
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model.trim="formInline.standardName"
-                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -253,9 +259,10 @@
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入项目编号'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -263,21 +270,23 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标项目'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入组织机构代码'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -288,49 +297,52 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标单位名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
-                size="default"
+            <el-form-item label="标准负责人:" prop="standardOwnerName">
+              <el-input
+                v-model.trim="formInline.standardOwnerName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="personClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
                 v-model="formInline.category"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择类别'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -340,6 +352,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -349,7 +362,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准等级'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -359,6 +372,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -368,7 +382,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择传递范围'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -377,6 +391,7 @@
                   v-for="item in transmitRangeList"
                   :key="item.id"
                   :label="item.name"
+                  clearable
                   :value="item.value"
                 />
               </el-select>
@@ -386,55 +401,57 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
+                type="date"
                 :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准科室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
-                size="default"
+              <el-input
+                v-model.trim="formInline.standardLaboratoryName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
-                @clear="clearDeptList"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeDeptList"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -442,20 +459,21 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
                 v-model.trim="formInline.managerState"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择管理状态'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -465,6 +483,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -474,7 +493,7 @@
               <el-select
                 v-model.trim="formInline.measureMajor"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择计量专业'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -484,6 +503,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -492,9 +512,10 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入考核单位'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -502,64 +523,67 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
-                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="2">
             <el-form-item label="环境条件" />
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
+            <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
+            <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
@@ -576,7 +600,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -592,7 +616,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input :placeholder="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -608,25 +632,25 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
+        <!-- <el-row :gutter="24">
           <el-col :span="3">
             <el-form-item label="附件:">
               <show-photo :minio-file-name="formInline.minioFileName" />
               <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
                 {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -634,6 +658,8 @@
       </el-form>
     </div>
   </app-container>
+  <person-list-dialog ref="personListdialog" @add="personListAdd" />
+  <laboratory-dialog ref="laboratorydialog" @add="laboratoryListAdd" />
 </template>
 
 <style lang="scss" scoped>
@@ -659,8 +685,4 @@
   border-radius: 10px;
   background-color: #fff;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
new file mode 100644
index 0000000..6024925
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -0,0 +1,148 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
new file mode 100644
index 0000000..bbf753f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -0,0 +1,187 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getStandardList } from '@/api/device/standard'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  category: '', // 类别
+  id: '',
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
+})
+const loadingTable = ref<boolean>(false)
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+}
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<columnsType[]>([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    align: 'center',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '标准等级',
+    value: 'standardLevelName',
+    align: 'center',
+  },
+  {
+    text: '传递范围',
+    value: 'transmitRangeName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  }])
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStandardList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    category: '', // 类别
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 9a9c992..7e02e2f 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -1,129 +1,145 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
+import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const props = defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-
 // 查询条件
 const listQuery = ref({
-  name: '', // 姓名
+  certificateStatus: '', // 姓名
+  major: '',
+  name: '',
+  staffNo: '',
+  verifierCertificateNo: '',
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
 })
 const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
+const columns = ref([
   {
-    text: '设备名称',
+    text: '姓名',
     value: 'name',
-    align: 'center',
   },
   {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
+    text: '人员编号',
+    value: 'staffNo',
   },
   {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
+    text: '所在部门',
+    value: 'deptId',
   },
   {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
+    text: '行政职务',
+    value: 'administrationJob',
   },
 ])
-const list = ref<object[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = res.data.total
+    }
+  })
+}
 // 搜索
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  fetchData()
 }
-const changePage = (e: any) => {
-  console.log(e)
-}
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
-    name: '', // 姓名
+    certificateStatus: '', // 姓名
+    major: '',
+    name: '',
+    staffNo: '',
+    verifierCertificateNo: '',
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
   }
-  list.value = props.list
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
   }
 }
-// 监听数据变化
-watch(
-  [() => props.list], ([newNums], [oldNums]) => {
-    list.value = newNums
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :pagination="false"
+        :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
@@ -131,6 +147,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 0b15289..07b439b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,10 +3,12 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../../standard_interface'
+import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: {
     type: String,
@@ -140,7 +142,7 @@
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
   organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
   category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
@@ -157,34 +159,20 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-const fileRef = ref() // 文件上传input
-const upload = () => {
-  fileRef.value.click()
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 标准实验室发生改变row类型
 interface rowReturn {
   phone: string
   director: string
+  name: string
+  organizeName: string
+  id: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
+// 实验室ref
+const laboratorydialog = ref()
+// 标准实验室点击
+const changeDeptList = () => {
+  laboratorydialog.value.initDialog()
 }
 // 标准实验室清空时
 const clearDeptList = () => {
@@ -205,6 +193,24 @@
 if (props.buttonType !== 'add') {
   getInfo()
 }
+// 计量人员组件
+const personListdialog = ref()
+// 点击选择负责人函数
+const personClick = () => {
+  personListdialog.value.initDialog()
+}
+// 选择负责人回调函数
+const personListAdd = (data: rowReturn) => {
+  formInline.value.standardOwner = data.id
+  formInline.value.standardOwnerName = data.name
+}
+// 选择完科室的回调函数
+const laboratoryListAdd = (data: rowReturn) => {
+  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratoryName = data.organizeName
+  formInline.value.laboratoryOwner = data.director
+  formInline.value.laboratoryOwnerContact = data.phone
+}
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -222,18 +228,17 @@
     <div class="info-content">
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
+                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -243,9 +248,10 @@
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model.trim="formInline.standardName"
-                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -253,9 +259,10 @@
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入项目编号'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -263,21 +270,23 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标项目'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入组织机构代码'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -288,49 +297,52 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标单位名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
-                size="default"
+            <el-form-item label="标准负责人:" prop="standardOwnerName">
+              <el-input
+                v-model.trim="formInline.standardOwnerName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="personClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
                 v-model="formInline.category"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择类别'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -340,6 +352,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -349,7 +362,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准等级'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -359,6 +372,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -368,7 +382,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择传递范围'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -377,6 +391,7 @@
                   v-for="item in transmitRangeList"
                   :key="item.id"
                   :label="item.name"
+                  clearable
                   :value="item.value"
                 />
               </el-select>
@@ -386,55 +401,57 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
+                type="date"
                 :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准科室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
-                size="default"
+              <el-input
+                v-model.trim="formInline.standardLaboratoryName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
-                @clear="clearDeptList"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeDeptList"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -442,20 +459,21 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
                 v-model.trim="formInline.managerState"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择管理状态'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -465,6 +483,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -474,7 +493,7 @@
               <el-select
                 v-model.trim="formInline.measureMajor"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择计量专业'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -484,6 +503,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -492,9 +512,10 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入考核单位'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -502,64 +523,67 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
-                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="2">
             <el-form-item label="环境条件" />
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
+            <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
+            <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
@@ -576,7 +600,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -592,7 +616,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input :placeholder="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -608,25 +632,25 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
+        <!-- <el-row :gutter="24">
           <el-col :span="3">
             <el-form-item label="附件:">
               <show-photo :minio-file-name="formInline.minioFileName" />
               <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
                 {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -634,6 +658,8 @@
       </el-form>
     </div>
   </app-container>
+  <person-list-dialog ref="personListdialog" @add="personListAdd" />
+  <laboratory-dialog ref="laboratorydialog" @add="laboratoryListAdd" />
 </template>
 
 <style lang="scss" scoped>
@@ -659,8 +685,4 @@
   border-radius: 10px;
   background-color: #fff;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
new file mode 100644
index 0000000..6024925
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -0,0 +1,148 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
new file mode 100644
index 0000000..c19de5d
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -0,0 +1,165 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUsersDept } from '@/api/device/standard'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  director: '',
+  ids: [],
+  limit: 20,
+  meterMajor: '',
+  offset: 1,
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '3',
+  pDeptId: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '科室编号',
+    value: 'organizeNo',
+  },
+  {
+    text: '科室名称',
+    value: 'organizeName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '行政职务',
+    value: 'administrationJobName',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getUsersDept(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    director: '',
+    ids: [],
+    limit: 20,
+    meterMajor: '',
+    createStartTime: '',
+    createEndTime: '',
+    offset: 1,
+    organizeName: '',
+    organizeNo: '',
+    organizeType: '3',
+    pDeptId: '',
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择科室')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeNo" placeholder="科室编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeName" placeholder="科室名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
new file mode 100644
index 0000000..bbf753f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -0,0 +1,187 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getStandardList } from '@/api/device/standard'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  category: '', // 类别
+  id: '',
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
+})
+const loadingTable = ref<boolean>(false)
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+}
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<columnsType[]>([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    align: 'center',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '标准等级',
+    value: 'standardLevelName',
+    align: 'center',
+  },
+  {
+    text: '传递范围',
+    value: 'transmitRangeName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  }])
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStandardList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    category: '', // 类别
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 9a9c992..7e02e2f 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -1,129 +1,145 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
+import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const props = defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-
 // 查询条件
 const listQuery = ref({
-  name: '', // 姓名
+  certificateStatus: '', // 姓名
+  major: '',
+  name: '',
+  staffNo: '',
+  verifierCertificateNo: '',
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
 })
 const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
+const columns = ref([
   {
-    text: '设备名称',
+    text: '姓名',
     value: 'name',
-    align: 'center',
   },
   {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
+    text: '人员编号',
+    value: 'staffNo',
   },
   {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
+    text: '所在部门',
+    value: 'deptId',
   },
   {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
+    text: '行政职务',
+    value: 'administrationJob',
   },
 ])
-const list = ref<object[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = res.data.total
+    }
+  })
+}
 // 搜索
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  fetchData()
 }
-const changePage = (e: any) => {
-  console.log(e)
-}
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
-    name: '', // 姓名
+    certificateStatus: '', // 姓名
+    major: '',
+    name: '',
+    staffNo: '',
+    verifierCertificateNo: '',
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
   }
-  list.value = props.list
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
   }
 }
-// 监听数据变化
-watch(
-  [() => props.list], ([newNums], [oldNums]) => {
-    list.value = newNums
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :pagination="false"
+        :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
@@ -131,6 +147,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 0b15289..07b439b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,10 +3,12 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../../standard_interface'
+import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: {
     type: String,
@@ -140,7 +142,7 @@
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
   organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
   category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
@@ -157,34 +159,20 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-const fileRef = ref() // 文件上传input
-const upload = () => {
-  fileRef.value.click()
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 标准实验室发生改变row类型
 interface rowReturn {
   phone: string
   director: string
+  name: string
+  organizeName: string
+  id: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
+// 实验室ref
+const laboratorydialog = ref()
+// 标准实验室点击
+const changeDeptList = () => {
+  laboratorydialog.value.initDialog()
 }
 // 标准实验室清空时
 const clearDeptList = () => {
@@ -205,6 +193,24 @@
 if (props.buttonType !== 'add') {
   getInfo()
 }
+// 计量人员组件
+const personListdialog = ref()
+// 点击选择负责人函数
+const personClick = () => {
+  personListdialog.value.initDialog()
+}
+// 选择负责人回调函数
+const personListAdd = (data: rowReturn) => {
+  formInline.value.standardOwner = data.id
+  formInline.value.standardOwnerName = data.name
+}
+// 选择完科室的回调函数
+const laboratoryListAdd = (data: rowReturn) => {
+  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratoryName = data.organizeName
+  formInline.value.laboratoryOwner = data.director
+  formInline.value.laboratoryOwnerContact = data.phone
+}
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -222,18 +228,17 @@
     <div class="info-content">
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
+                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -243,9 +248,10 @@
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model.trim="formInline.standardName"
-                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -253,9 +259,10 @@
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入项目编号'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -263,21 +270,23 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标项目'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入组织机构代码'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -288,49 +297,52 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标单位名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
-                size="default"
+            <el-form-item label="标准负责人:" prop="standardOwnerName">
+              <el-input
+                v-model.trim="formInline.standardOwnerName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="personClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
                 v-model="formInline.category"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择类别'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -340,6 +352,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -349,7 +362,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准等级'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -359,6 +372,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -368,7 +382,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择传递范围'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -377,6 +391,7 @@
                   v-for="item in transmitRangeList"
                   :key="item.id"
                   :label="item.name"
+                  clearable
                   :value="item.value"
                 />
               </el-select>
@@ -386,55 +401,57 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
+                type="date"
                 :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准科室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
-                size="default"
+              <el-input
+                v-model.trim="formInline.standardLaboratoryName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
-                @clear="clearDeptList"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeDeptList"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -442,20 +459,21 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
                 v-model.trim="formInline.managerState"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择管理状态'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -465,6 +483,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -474,7 +493,7 @@
               <el-select
                 v-model.trim="formInline.measureMajor"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择计量专业'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -484,6 +503,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -492,9 +512,10 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入考核单位'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -502,64 +523,67 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
-                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="2">
             <el-form-item label="环境条件" />
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
+            <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
+            <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
@@ -576,7 +600,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -592,7 +616,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input :placeholder="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -608,25 +632,25 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
+        <!-- <el-row :gutter="24">
           <el-col :span="3">
             <el-form-item label="附件:">
               <show-photo :minio-file-name="formInline.minioFileName" />
               <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
                 {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -634,6 +658,8 @@
       </el-form>
     </div>
   </app-container>
+  <person-list-dialog ref="personListdialog" @add="personListAdd" />
+  <laboratory-dialog ref="laboratorydialog" @add="laboratoryListAdd" />
 </template>
 
 <style lang="scss" scoped>
@@ -659,8 +685,4 @@
   border-radius: 10px;
   background-color: #fff;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
new file mode 100644
index 0000000..6024925
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -0,0 +1,148 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
new file mode 100644
index 0000000..c19de5d
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -0,0 +1,165 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUsersDept } from '@/api/device/standard'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  director: '',
+  ids: [],
+  limit: 20,
+  meterMajor: '',
+  offset: 1,
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '3',
+  pDeptId: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '科室编号',
+    value: 'organizeNo',
+  },
+  {
+    text: '科室名称',
+    value: 'organizeName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '行政职务',
+    value: 'administrationJobName',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getUsersDept(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    director: '',
+    ids: [],
+    limit: 20,
+    meterMajor: '',
+    createStartTime: '',
+    createEndTime: '',
+    offset: 1,
+    organizeName: '',
+    organizeNo: '',
+    organizeType: '3',
+    pDeptId: '',
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择科室')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeNo" placeholder="科室编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeName" placeholder="科室名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index bb89e24..e0409c5 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -29,7 +29,7 @@
     default: '',
   },
 })
-const emits = defineEmits(['changePage', 'addRow', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
+const emits = defineEmits(['changePage', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
 const searchQuery = ref({
   limit: 10,
   offset: 1,
@@ -45,14 +45,6 @@
   }
   emits('changePage', searchQuery)
 }
-// 点击增加行
-const addRow = () => {
-  emits('addRow')
-}
-// 点击删除行
-const deleteRow = () => {
-  emits('deleteRow', props.title)
-}
 // 多选发生改变
 const handleSelectionChange = (object: object[]) => {
   emits('handleSelectionChange', object, props.title)
@@ -64,41 +56,28 @@
 </script>
 
 <template>
-  <detail-block :title="title">
-    <template #btns>
-      <el-button v-if="buttonType !== 'detail'" type="info" :disabled="buttonType === 'detail'" @click="deleteRow">
-        删除行
-      </el-button>
-      <el-button v-if="buttonType !== 'detail'" type="primary" :disabled="buttonType === 'detail'" @click="addRow">
-        增加行
-      </el-button>
-    </template>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :prop="item.value">
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
-            <template #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-        <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
-        </template>
-      </el-table-column>
-    </el-table>
-  </detail-block>
+  <el-table
+    :data="list"
+    border
+    style="width: 100%;"
+    @selection-change="handleSelectionChange"
+  >
+    <el-table-column v-if="buttonType !== 'detail'" type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="(item, index) in columns" :key="index" align="center" :width="item.width" :label="item.text" :prop="item.value">
+      <template #header>
+        <span style="color: red;">*</span><span>{{ item.text }}</span>
+      </template>
+      <template v-if="item.text === '姓名' && buttonType !== 'detail' || item.text === '设备名称' && buttonType !== 'detail' || item.text === '文件名称' && buttonType !== 'detail'" #default="scope">
+        <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
+          <template #append>
+            <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
+              选择
+            </el-button>
+          </template>
+        </el-input>
+      </template>
+    </el-table-column>
+  </el-table>
 </template>
 

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
new file mode 100644
index 0000000..bbf753f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -0,0 +1,187 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getStandardList } from '@/api/device/standard'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  category: '', // 类别
+  id: '',
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
+})
+const loadingTable = ref<boolean>(false)
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+}
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<columnsType[]>([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    align: 'center',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '标准等级',
+    value: 'standardLevelName',
+    align: 'center',
+  },
+  {
+    text: '传递范围',
+    value: 'transmitRangeName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  }])
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStandardList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    category: '', // 类别
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 9a9c992..7e02e2f 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -1,129 +1,145 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
+import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const props = defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-
 // 查询条件
 const listQuery = ref({
-  name: '', // 姓名
+  certificateStatus: '', // 姓名
+  major: '',
+  name: '',
+  staffNo: '',
+  verifierCertificateNo: '',
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
 })
 const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
+const columns = ref([
   {
-    text: '设备名称',
+    text: '姓名',
     value: 'name',
-    align: 'center',
   },
   {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
+    text: '人员编号',
+    value: 'staffNo',
   },
   {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
+    text: '所在部门',
+    value: 'deptId',
   },
   {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
+    text: '行政职务',
+    value: 'administrationJob',
   },
 ])
-const list = ref<object[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = res.data.total
+    }
+  })
+}
 // 搜索
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  fetchData()
 }
-const changePage = (e: any) => {
-  console.log(e)
-}
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
-    name: '', // 姓名
+    certificateStatus: '', // 姓名
+    major: '',
+    name: '',
+    staffNo: '',
+    verifierCertificateNo: '',
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
   }
-  list.value = props.list
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
   }
 }
-// 监听数据变化
-watch(
-  [() => props.list], ([newNums], [oldNums]) => {
-    list.value = newNums
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :pagination="false"
+        :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
@@ -131,6 +147,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 0b15289..07b439b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,10 +3,12 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../../standard_interface'
+import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: {
     type: String,
@@ -140,7 +142,7 @@
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
   organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
   category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
@@ -157,34 +159,20 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-const fileRef = ref() // 文件上传input
-const upload = () => {
-  fileRef.value.click()
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 标准实验室发生改变row类型
 interface rowReturn {
   phone: string
   director: string
+  name: string
+  organizeName: string
+  id: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
+// 实验室ref
+const laboratorydialog = ref()
+// 标准实验室点击
+const changeDeptList = () => {
+  laboratorydialog.value.initDialog()
 }
 // 标准实验室清空时
 const clearDeptList = () => {
@@ -205,6 +193,24 @@
 if (props.buttonType !== 'add') {
   getInfo()
 }
+// 计量人员组件
+const personListdialog = ref()
+// 点击选择负责人函数
+const personClick = () => {
+  personListdialog.value.initDialog()
+}
+// 选择负责人回调函数
+const personListAdd = (data: rowReturn) => {
+  formInline.value.standardOwner = data.id
+  formInline.value.standardOwnerName = data.name
+}
+// 选择完科室的回调函数
+const laboratoryListAdd = (data: rowReturn) => {
+  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratoryName = data.organizeName
+  formInline.value.laboratoryOwner = data.director
+  formInline.value.laboratoryOwnerContact = data.phone
+}
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -222,18 +228,17 @@
     <div class="info-content">
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
+                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -243,9 +248,10 @@
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model.trim="formInline.standardName"
-                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -253,9 +259,10 @@
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入项目编号'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -263,21 +270,23 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标项目'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入组织机构代码'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -288,49 +297,52 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标单位名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
-                size="default"
+            <el-form-item label="标准负责人:" prop="standardOwnerName">
+              <el-input
+                v-model.trim="formInline.standardOwnerName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="personClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
                 v-model="formInline.category"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择类别'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -340,6 +352,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -349,7 +362,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准等级'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -359,6 +372,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -368,7 +382,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择传递范围'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -377,6 +391,7 @@
                   v-for="item in transmitRangeList"
                   :key="item.id"
                   :label="item.name"
+                  clearable
                   :value="item.value"
                 />
               </el-select>
@@ -386,55 +401,57 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
+                type="date"
                 :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准科室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
-                size="default"
+              <el-input
+                v-model.trim="formInline.standardLaboratoryName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
-                @clear="clearDeptList"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeDeptList"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -442,20 +459,21 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
                 v-model.trim="formInline.managerState"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择管理状态'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -465,6 +483,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -474,7 +493,7 @@
               <el-select
                 v-model.trim="formInline.measureMajor"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择计量专业'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -484,6 +503,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -492,9 +512,10 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入考核单位'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -502,64 +523,67 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
-                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="2">
             <el-form-item label="环境条件" />
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
+            <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
+            <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
@@ -576,7 +600,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -592,7 +616,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input :placeholder="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -608,25 +632,25 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
+        <!-- <el-row :gutter="24">
           <el-col :span="3">
             <el-form-item label="附件:">
               <show-photo :minio-file-name="formInline.minioFileName" />
               <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
                 {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -634,6 +658,8 @@
       </el-form>
     </div>
   </app-container>
+  <person-list-dialog ref="personListdialog" @add="personListAdd" />
+  <laboratory-dialog ref="laboratorydialog" @add="laboratoryListAdd" />
 </template>
 
 <style lang="scss" scoped>
@@ -659,8 +685,4 @@
   border-radius: 10px;
   background-color: #fff;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
new file mode 100644
index 0000000..6024925
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -0,0 +1,148 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
new file mode 100644
index 0000000..c19de5d
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -0,0 +1,165 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUsersDept } from '@/api/device/standard'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  director: '',
+  ids: [],
+  limit: 20,
+  meterMajor: '',
+  offset: 1,
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '3',
+  pDeptId: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '科室编号',
+    value: 'organizeNo',
+  },
+  {
+    text: '科室名称',
+    value: 'organizeName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '行政职务',
+    value: 'administrationJobName',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getUsersDept(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    director: '',
+    ids: [],
+    limit: 20,
+    meterMajor: '',
+    createStartTime: '',
+    createEndTime: '',
+    offset: 1,
+    organizeName: '',
+    organizeNo: '',
+    organizeType: '3',
+    pDeptId: '',
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择科室')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeNo" placeholder="科室编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeName" placeholder="科室名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index bb89e24..e0409c5 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -29,7 +29,7 @@
     default: '',
   },
 })
-const emits = defineEmits(['changePage', 'addRow', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
+const emits = defineEmits(['changePage', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
 const searchQuery = ref({
   limit: 10,
   offset: 1,
@@ -45,14 +45,6 @@
   }
   emits('changePage', searchQuery)
 }
-// 点击增加行
-const addRow = () => {
-  emits('addRow')
-}
-// 点击删除行
-const deleteRow = () => {
-  emits('deleteRow', props.title)
-}
 // 多选发生改变
 const handleSelectionChange = (object: object[]) => {
   emits('handleSelectionChange', object, props.title)
@@ -64,41 +56,28 @@
 </script>
 
 <template>
-  <detail-block :title="title">
-    <template #btns>
-      <el-button v-if="buttonType !== 'detail'" type="info" :disabled="buttonType === 'detail'" @click="deleteRow">
-        删除行
-      </el-button>
-      <el-button v-if="buttonType !== 'detail'" type="primary" :disabled="buttonType === 'detail'" @click="addRow">
-        增加行
-      </el-button>
-    </template>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :prop="item.value">
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
-            <template #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-        <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
-        </template>
-      </el-table-column>
-    </el-table>
-  </detail-block>
+  <el-table
+    :data="list"
+    border
+    style="width: 100%;"
+    @selection-change="handleSelectionChange"
+  >
+    <el-table-column v-if="buttonType !== 'detail'" type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="(item, index) in columns" :key="index" align="center" :width="item.width" :label="item.text" :prop="item.value">
+      <template #header>
+        <span style="color: red;">*</span><span>{{ item.text }}</span>
+      </template>
+      <template v-if="item.text === '姓名' && buttonType !== 'detail' || item.text === '设备名称' && buttonType !== 'detail' || item.text === '文件名称' && buttonType !== 'detail'" #default="scope">
+        <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
+          <template #append>
+            <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
+              选择
+            </el-button>
+          </template>
+        </el-input>
+      </template>
+    </el-table-column>
+  </el-table>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
new file mode 100644
index 0000000..6453565
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -0,0 +1,169 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  effectiveStatus: '',
+  fileCode: '',
+  fileName: '',
+  fileNo: '',
+  fileType: '10',
+  formId: 'jlglwjsp',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  publishEndTime: '',
+  publishStartTime: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    effectiveStatus: '',
+    fileCode: '',
+    fileName: '',
+    fileNo: '',
+    fileType: '10',
+    formId: 'jlglwjsp',
+    ids: [],
+    limit: 20,
+    offset: 1,
+    publishEndTime: '',
+    publishStartTime: '',
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择文件" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.fileName"
+          placeholder="文件名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.fileNo"
+          placeholder="文件编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
new file mode 100644
index 0000000..bbf753f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -0,0 +1,187 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getStandardList } from '@/api/device/standard'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  category: '', // 类别
+  id: '',
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
+})
+const loadingTable = ref<boolean>(false)
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+}
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<columnsType[]>([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    align: 'center',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '标准等级',
+    value: 'standardLevelName',
+    align: 'center',
+  },
+  {
+    text: '传递范围',
+    value: 'transmitRangeName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  }])
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStandardList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    category: '', // 类别
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 9a9c992..7e02e2f 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -1,129 +1,145 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
+import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const props = defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-
 // 查询条件
 const listQuery = ref({
-  name: '', // 姓名
+  certificateStatus: '', // 姓名
+  major: '',
+  name: '',
+  staffNo: '',
+  verifierCertificateNo: '',
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
 })
 const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
+const columns = ref([
   {
-    text: '设备名称',
+    text: '姓名',
     value: 'name',
-    align: 'center',
   },
   {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
+    text: '人员编号',
+    value: 'staffNo',
   },
   {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
+    text: '所在部门',
+    value: 'deptId',
   },
   {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
+    text: '行政职务',
+    value: 'administrationJob',
   },
 ])
-const list = ref<object[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = res.data.total
+    }
+  })
+}
 // 搜索
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  fetchData()
 }
-const changePage = (e: any) => {
-  console.log(e)
-}
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
-    name: '', // 姓名
+    certificateStatus: '', // 姓名
+    major: '',
+    name: '',
+    staffNo: '',
+    verifierCertificateNo: '',
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
   }
-  list.value = props.list
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
   }
 }
-// 监听数据变化
-watch(
-  [() => props.list], ([newNums], [oldNums]) => {
-    list.value = newNums
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :pagination="false"
+        :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
@@ -131,6 +147,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 0b15289..07b439b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,10 +3,12 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../../standard_interface'
+import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: {
     type: String,
@@ -140,7 +142,7 @@
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
   organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
   category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
@@ -157,34 +159,20 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-const fileRef = ref() // 文件上传input
-const upload = () => {
-  fileRef.value.click()
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 标准实验室发生改变row类型
 interface rowReturn {
   phone: string
   director: string
+  name: string
+  organizeName: string
+  id: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
+// 实验室ref
+const laboratorydialog = ref()
+// 标准实验室点击
+const changeDeptList = () => {
+  laboratorydialog.value.initDialog()
 }
 // 标准实验室清空时
 const clearDeptList = () => {
@@ -205,6 +193,24 @@
 if (props.buttonType !== 'add') {
   getInfo()
 }
+// 计量人员组件
+const personListdialog = ref()
+// 点击选择负责人函数
+const personClick = () => {
+  personListdialog.value.initDialog()
+}
+// 选择负责人回调函数
+const personListAdd = (data: rowReturn) => {
+  formInline.value.standardOwner = data.id
+  formInline.value.standardOwnerName = data.name
+}
+// 选择完科室的回调函数
+const laboratoryListAdd = (data: rowReturn) => {
+  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratoryName = data.organizeName
+  formInline.value.laboratoryOwner = data.director
+  formInline.value.laboratoryOwnerContact = data.phone
+}
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -222,18 +228,17 @@
     <div class="info-content">
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
+                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -243,9 +248,10 @@
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model.trim="formInline.standardName"
-                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -253,9 +259,10 @@
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入项目编号'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -263,21 +270,23 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标项目'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入组织机构代码'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -288,49 +297,52 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标单位名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
-                size="default"
+            <el-form-item label="标准负责人:" prop="standardOwnerName">
+              <el-input
+                v-model.trim="formInline.standardOwnerName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="personClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
                 v-model="formInline.category"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择类别'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -340,6 +352,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -349,7 +362,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准等级'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -359,6 +372,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -368,7 +382,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择传递范围'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -377,6 +391,7 @@
                   v-for="item in transmitRangeList"
                   :key="item.id"
                   :label="item.name"
+                  clearable
                   :value="item.value"
                 />
               </el-select>
@@ -386,55 +401,57 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
+                type="date"
                 :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准科室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
-                size="default"
+              <el-input
+                v-model.trim="formInline.standardLaboratoryName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
-                @clear="clearDeptList"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeDeptList"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -442,20 +459,21 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
                 v-model.trim="formInline.managerState"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择管理状态'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -465,6 +483,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -474,7 +493,7 @@
               <el-select
                 v-model.trim="formInline.measureMajor"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择计量专业'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -484,6 +503,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -492,9 +512,10 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入考核单位'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -502,64 +523,67 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
-                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="2">
             <el-form-item label="环境条件" />
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
+            <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
+            <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
@@ -576,7 +600,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -592,7 +616,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input :placeholder="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -608,25 +632,25 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
+        <!-- <el-row :gutter="24">
           <el-col :span="3">
             <el-form-item label="附件:">
               <show-photo :minio-file-name="formInline.minioFileName" />
               <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
                 {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -634,6 +658,8 @@
       </el-form>
     </div>
   </app-container>
+  <person-list-dialog ref="personListdialog" @add="personListAdd" />
+  <laboratory-dialog ref="laboratorydialog" @add="laboratoryListAdd" />
 </template>
 
 <style lang="scss" scoped>
@@ -659,8 +685,4 @@
   border-radius: 10px;
   background-color: #fff;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
new file mode 100644
index 0000000..6024925
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -0,0 +1,148 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
new file mode 100644
index 0000000..c19de5d
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -0,0 +1,165 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUsersDept } from '@/api/device/standard'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  director: '',
+  ids: [],
+  limit: 20,
+  meterMajor: '',
+  offset: 1,
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '3',
+  pDeptId: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '科室编号',
+    value: 'organizeNo',
+  },
+  {
+    text: '科室名称',
+    value: 'organizeName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '行政职务',
+    value: 'administrationJobName',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getUsersDept(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    director: '',
+    ids: [],
+    limit: 20,
+    meterMajor: '',
+    createStartTime: '',
+    createEndTime: '',
+    offset: 1,
+    organizeName: '',
+    organizeNo: '',
+    organizeType: '3',
+    pDeptId: '',
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择科室')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeNo" placeholder="科室编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeName" placeholder="科室名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index bb89e24..e0409c5 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -29,7 +29,7 @@
     default: '',
   },
 })
-const emits = defineEmits(['changePage', 'addRow', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
+const emits = defineEmits(['changePage', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
 const searchQuery = ref({
   limit: 10,
   offset: 1,
@@ -45,14 +45,6 @@
   }
   emits('changePage', searchQuery)
 }
-// 点击增加行
-const addRow = () => {
-  emits('addRow')
-}
-// 点击删除行
-const deleteRow = () => {
-  emits('deleteRow', props.title)
-}
 // 多选发生改变
 const handleSelectionChange = (object: object[]) => {
   emits('handleSelectionChange', object, props.title)
@@ -64,41 +56,28 @@
 </script>
 
 <template>
-  <detail-block :title="title">
-    <template #btns>
-      <el-button v-if="buttonType !== 'detail'" type="info" :disabled="buttonType === 'detail'" @click="deleteRow">
-        删除行
-      </el-button>
-      <el-button v-if="buttonType !== 'detail'" type="primary" :disabled="buttonType === 'detail'" @click="addRow">
-        增加行
-      </el-button>
-    </template>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :prop="item.value">
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
-            <template #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-        <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
-        </template>
-      </el-table-column>
-    </el-table>
-  </detail-block>
+  <el-table
+    :data="list"
+    border
+    style="width: 100%;"
+    @selection-change="handleSelectionChange"
+  >
+    <el-table-column v-if="buttonType !== 'detail'" type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="(item, index) in columns" :key="index" align="center" :width="item.width" :label="item.text" :prop="item.value">
+      <template #header>
+        <span style="color: red;">*</span><span>{{ item.text }}</span>
+      </template>
+      <template v-if="item.text === '姓名' && buttonType !== 'detail' || item.text === '设备名称' && buttonType !== 'detail' || item.text === '文件名称' && buttonType !== 'detail'" #default="scope">
+        <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
+          <template #append>
+            <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
+              选择
+            </el-button>
+          </template>
+        </el-input>
+      </template>
+    </el-table-column>
+  </el-table>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
new file mode 100644
index 0000000..6453565
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -0,0 +1,169 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  effectiveStatus: '',
+  fileCode: '',
+  fileName: '',
+  fileNo: '',
+  fileType: '10',
+  formId: 'jlglwjsp',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  publishEndTime: '',
+  publishStartTime: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    effectiveStatus: '',
+    fileCode: '',
+    fileName: '',
+    fileNo: '',
+    fileType: '10',
+    formId: 'jlglwjsp',
+    ids: [],
+    limit: 20,
+    offset: 1,
+    publishEndTime: '',
+    publishStartTime: '',
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择文件" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.fileName"
+          placeholder="文件名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.fileNo"
+          placeholder="文件编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 81409c2..ff45abc 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -5,10 +5,12 @@
 import type { IOptions } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
-import userListDialog from '@/views/measure/person/components/userListDialog.vue'
+import userListDialog from './standardList/userListDialog.vue'
+import SelectDeviceDialog from './standardList/equipmentDialog.vue'
+import VerificationDialog from './standardList/verificationDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -59,6 +61,7 @@
 const close = () => {
   $router.back()
 }
+// 拿到formInline的数据
 const setData = (newValue: object) => {
   formInline.value = newValue
 }
@@ -68,71 +71,85 @@
   offset: 1,
 }
 // 关闭
+// 表头类型
 interface TableColumn {
   text: string
   value: string
   align: string
+  width?: string
 }
 
 interface checkedRecord {
   text: string
 }
-// 计量人员
-const measurementPersonnelColumns = ref<TableColumn[]>([
+// 计量人员表头
+const measurementPersonnelColumns = ref([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
-  { text: '工作部门', value: 'deptName', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书编号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
+// 计量人员数据
 const measurementPersonnel = ref<checkedRecord[]>([])
+// 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
-function fetchmeasurementPersonnel(query = { ...queryParams }) {
+// 计量人员发送请求获取数据
+function fetchmeasurementPersonnel() {
   measurementPersonnelLoading.value = true
-  measurementPersonnel.value = [{
-    text: 'xx',
-  }]
-  measurementPersonnelLoading.value = false
+  getuserListPage({ id: infoId.value }).then((res) => {
+    measurementPersonnel.value = res.data.rows
+    measurementPersonnelLoading.value = false
+  })
 }
 
-// 标准配套设备
+// 标准配套设备表头
 const corollaryEquipmentColumns = ref<TableColumn[]>([
-  { text: '设备名称', value: 'text', align: 'center' },
-  { text: '设备编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '测量范围', value: 'text', align: 'center' },
-  { text: '使用部门', value: 'text', align: 'center' },
-  { text: '检定时间', value: 'text', align: 'center' },
-  { text: '检定结果', value: 'text', align: 'center' },
-  { text: '有效日期', value: 'text', align: 'center' },
+  { text: '设备名称', value: 'name', align: 'center', width: '180' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDept', align: 'center' },
+  { text: '检定时间', value: 'mesureDate', align: 'center' },
+  { text: '检定结果', value: 'mesureResult', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
 ])
+// 标准配套设备数据
 const corollaryEquipment = ref<checkedRecord[]>([])
+// 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
+// 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
-  corollaryEquipment.value = [{
-    text: 'xx',
-  }]
-  corollaryEquipmentLoading.value = false
+  getEquipmentListPage({ id: infoId.value }).then((res) => {
+    corollaryEquipment.value = res.data.rows.map((item) => {
+      item.name = item.equipmentName
+      return item
+    })
+    corollaryEquipmentLoading.value = false
+  })
 }
 
 // 检定规程
 const regulationVerificationColumns = ref<TableColumn[]>([
-  { text: '文件名称', value: 'text', align: 'center' },
-  { text: '文件编号', value: 'text', align: 'center' },
-  { text: '文件号', value: 'text', align: 'center' },
-  { text: '实施时间', value: 'text', align: 'center' },
-  { text: '实施状态', value: 'text', align: 'center' },
+  { text: '文件名称', value: 'name', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
 const regulationVerification = ref<checkedRecord[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
-  regulationVerification.value = [{
-    text: 'xx',
-  }]
-  regulationVerificationLoading.value = false
+  getRegulationListPage({ id: infoId.value }).then((res) => {
+    regulationVerification.value = res.data.rows.map((item) => {
+      item.name = item.fileName
+      return item
+    })
+    regulationVerificationLoading.value = false
+  })
 }
 
 // 重复性考核记录
@@ -146,9 +163,7 @@
 const repetitiveRppraisalRecordLoading = ref(false)
 function fetchrepetitiveRppraisalRecord(query = { ...queryParams }) {
   repetitiveRppraisalRecordLoading.value = true
-  repetitiveRppraisalRecord.value = [{
-    text: 'xx',
-  }]
+  repetitiveRppraisalRecord.value = []
   repetitiveRppraisalRecordLoading.value = false
 }
 
@@ -163,9 +178,7 @@
 const stabilityAssessmentRecordLoading = ref(false)
 function fetchstabilityAssessmentRecord(query = { ...queryParams }) {
   stabilityAssessmentRecordLoading.value = true
-  stabilityAssessmentRecord.value = [{
-    text: 'xx',
-  }]
+  stabilityAssessmentRecord.value = []
   stabilityAssessmentRecordLoading.value = false
 }
 
@@ -181,25 +194,17 @@
 const certificateManagementLoading = ref(false)
 function fetchcertificateManagement(query = { ...queryParams }) {
   certificateManagementLoading.value = true
-  certificateManagement.value = [{
-    text: 'xx',
-  }]
+  certificateManagement.value = []
   certificateManagementLoading.value = false
 }
 // 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    // 打印
-
-  }
+const submitFormUpdate = () => {
+  formInline.value.id = infoId.value
+  getStandardLisUpdate(formInline.value).then((res) => {
+    if (res.code === 200) {
+      close()
+    }
+  })
 }
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -211,27 +216,23 @@
 })
 // 提交
 const submitForm = () => {
-  if (pageType.value === 'detail') { return submitFormDetail() }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    current.value = '基本信息'
-    console.log(baseInfoRef.value.submitForm(), '000')
-    baseInfoRef.value.submitForm().validate().then(() => {
-      pageType.value === 'add'
-        ? getStandardListAdd(formInline.value).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('新增成功')
-            close()
-          }
-        })
-        : submitFormDetail()
+  if (pageType.value === 'edit') { return submitFormUpdate() }
+  baseInfoRef.value.submitForm().validate().then(() => {
+    ElMessageBox.confirm(
+      '确认提交吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      getStandardListAdd(formInline.value).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('新增成功')
+          close()
+        }
+      })
     })
   })
 }
@@ -255,11 +256,24 @@
   regulationVerification.value.push({})
   // ElMessage.warning('请先选择上一条信息')
 }
+// 设备ref
+const selectDeviceDialog = ref()
+// 检定规程ref
+const verificationDialog = ref()
+// 点击表格中的选择按钮
 function selectPerson(index: number, text: string) {
   if (text === '姓名') {
     userListRef.value.initDialog()
     listIndex.value = index
   }
+  else if (text === '设备名称') {
+    selectDeviceDialog.value.initDialog()
+    listIndex.value = index
+  }
+  else if (text === '文件名称') {
+    verificationDialog.value.initDialog()
+    listIndex.value = index
+  }
 }
 // 多选框选中
 function handleSelectionChange(Array: object[], title: string) {
@@ -277,7 +291,17 @@
 const deleteRow = (title: string) => {
   if (title === '计量人员') {
     if (measurementPersonnelSelectionList.value.length > 0) {
-      measurementPersonnel.value = measurementPersonnel.value.filter(item => !measurementPersonnelSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        measurementPersonnel.value = measurementPersonnel.value.filter(item => !measurementPersonnelSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -285,7 +309,17 @@
   }
   else if (title === '标准配套设备') {
     if (corollaryEquipmentSelectionList.value.length > 0) {
-      corollaryEquipment.value = corollaryEquipment.value.filter(item => !corollaryEquipmentSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        corollaryEquipment.value = corollaryEquipment.value.filter(item => !corollaryEquipmentSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -293,7 +327,17 @@
   }
   else if (title === '检定规程') {
     if (regulationVerificationSelectionList.value.length > 0) {
-      regulationVerification.value = regulationVerification.value.filter(item => !regulationVerificationSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        regulationVerification.value = regulationVerification.value.filter(item => !regulationVerificationSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -304,15 +348,59 @@
 const confirmPerson = (object: object) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
+    measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
+    measurementPersonnel.value[listIndex.value].userId = object.id
+    setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
     ElMessage.warning('该人员已经存在')
     measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
+// 选择完设备后
+const selectDeviceList = (data: object) => {
+  if (!corollaryEquipment.value.includes(data)) {
+    corollaryEquipment.value[listIndex.value] = data
+    corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
+    corollaryEquipment.value[listIndex.value].equipmentId = data.id
+    corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
+  }
+  else {
+    ElMessage.warning('该设备已经存在')
+    corollaryEquipment.value.splice(listIndex.value, 1)
+  }
+}
+// 检定规程选择完成后
+const verificationList = (data: object) => {
+  if (!regulationVerification.value.includes(data)) {
+    regulationVerification.value[listIndex.value] = data
+    regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
+    regulationVerification.value[listIndex.value].verifyRegulationId = data.id
+    regulationVerification.value[listIndex.value].name = data.fileName
+    getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
+  }
+  else {
+    ElMessage.warning('该设备已经存在')
+    regulationVerification.value.splice(listIndex.value, 1)
+  }
+}
+
+// 增加行
+const addRow = (title: string) => {
+  if (title === '计量人员') {
+    measurementPersonnelAddRow()
+  }
+  else if (title === '标准配套设备') {
+    corollaryEquipmentAddRow()
+  }
+  else if (title === '检定规程') {
+    regulationVerificationAddRow()
+  }
+}
 onMounted(() => {
   if (pageType.value === 'detail') {
-    // fetchmeasurementPersonnel()  // 计量人员
+    fetchmeasurementPersonnel() // 计量人员
     fetchcorollaryEquipment() // 标准配套设备
     fetchregulationVerification() // 检定规程
     fetchrepetitiveRppraisalRecord() // 重复性考核记录
@@ -320,7 +408,7 @@
     fetchcertificateManagement() // 证书管理
   }
   else if (pageType.value === 'edit') {
-    // fetchmeasurementPersonnel()  // 计量人员
+    fetchmeasurementPersonnel() // 计量人员
     fetchcorollaryEquipment() // 标准配套设备
     fetchregulationVerification() // 检定规程
   }
@@ -351,7 +439,7 @@
       </template>
       <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
     </detail-page>
-    <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" title="">
+    <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" :title="pageType === 'detail' ? '' : current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
@@ -359,15 +447,27 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="current === '计量人员'" title="计量人员" :button-type="pageType" :columns="measurementPersonnelColumns" :list="measurementPersonnel" :loading="measurementPersonnelLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @add-row="measurementPersonnelAddRow" @handleSelectionChange="handleSelectionChange" @change-page="fetchmeasurementPersonnel" />
-      <template-table v-if="current === '标准配套设备'" title="标准配套设备" :button-type="pageType" :columns="corollaryEquipmentColumns" :list="corollaryEquipment" :loading="corollaryEquipmentLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @change-page="fetchcorollaryEquipment" @handleSelectionChange="handleSelectionChange" @add-row="corollaryEquipmentAddRow" />
-      <template-table v-if="current === '检定规程'" title="检定规程" :button-type="pageType" :columns="regulationVerificationColumns" :list="regulationVerification" :loading="corollaryEquipmentLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @change-page="fetchregulationVerification" @handleSelectionChange="handleSelectionChange" @add-row="regulationVerificationAddRow" />
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow(current)">
+          添加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteRow(current)">
+          删除行
+        </el-button>
+      </template>
+      <template-table v-if="current === '计量人员'" title="计量人员" :button-type="pageType" :columns="measurementPersonnelColumns" :list="measurementPersonnel" :loading="measurementPersonnelLoading" @selectPerson="selectPerson" @handleSelectionChange="handleSelectionChange" @change-page="fetchmeasurementPersonnel" />
+      <template-table v-if="current === '标准配套设备'" title="标准配套设备" :button-type="pageType" :columns="corollaryEquipmentColumns" :list="corollaryEquipment" :loading="corollaryEquipmentLoading" @selectPerson="selectPerson" @change-page="fetchcorollaryEquipment" @handleSelectionChange="handleSelectionChange" />
+      <template-table v-if="current === '检定规程'" title="检定规程" :button-type="pageType" :columns="regulationVerificationColumns" :list="regulationVerification" :loading="corollaryEquipmentLoading" @selectPerson="selectPerson" @change-page="fetchregulationVerification" @handleSelectionChange="handleSelectionChange" />
       <template-table v-if="current === '重复性考核记录'" title="重复性考核记录" :button-type="pageType" :columns="repetitiveRppraisalRecordColumns" :list="repetitiveRppraisalRecord" :loading="repetitiveRppraisalRecordLoading" @change-page="fetchrepetitiveRppraisalRecord" />
       <template-table v-if="current === '稳定性考核记录'" title="稳定性考核记录" :button-type="pageType" :columns="stabilityAssessmentRecordColumns" :list="stabilityAssessmentRecord" :loading="stabilityAssessmentRecordLoading" @change-page="fetchstabilityAssessmentRecord" />
       <template-table v-if="current === '证书管理'" title="证书管理" :button-type="pageType" :columns="certificateManagementColumns" :list="certificateManagement" :loading="certificateManagementLoading" @change-page="fetchcertificateManagement" />
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
-    <user-list-dialog ref="userListRef" :list="measurementPersonnel" @add="confirmPerson" />
+    <user-list-dialog ref="userListRef" @add="confirmPerson" />
+    <!-- 选择设备列表组件 -->
+    <select-device-dialog ref="selectDeviceDialog" @add="selectDeviceList" />
+    <!-- 选择检定规程列表组件 -->
+    <verification-dialog ref="verificationDialog" @add="verificationList" />
   </app-container>
 </template>
 

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
new file mode 100644
index 0000000..bbf753f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -0,0 +1,187 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getStandardList } from '@/api/device/standard'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  category: '', // 类别
+  id: '',
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
+})
+const loadingTable = ref<boolean>(false)
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+}
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<columnsType[]>([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    align: 'center',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '标准等级',
+    value: 'standardLevelName',
+    align: 'center',
+  },
+  {
+    text: '传递范围',
+    value: 'transmitRangeName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  }])
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStandardList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    category: '', // 类别
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 9a9c992..7e02e2f 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -1,129 +1,145 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
+import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const props = defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-
 // 查询条件
 const listQuery = ref({
-  name: '', // 姓名
+  certificateStatus: '', // 姓名
+  major: '',
+  name: '',
+  staffNo: '',
+  verifierCertificateNo: '',
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
 })
 const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
+const columns = ref([
   {
-    text: '设备名称',
+    text: '姓名',
     value: 'name',
-    align: 'center',
   },
   {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
+    text: '人员编号',
+    value: 'staffNo',
   },
   {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
+    text: '所在部门',
+    value: 'deptId',
   },
   {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
+    text: '行政职务',
+    value: 'administrationJob',
   },
 ])
-const list = ref<object[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = res.data.total
+    }
+  })
+}
 // 搜索
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  fetchData()
 }
-const changePage = (e: any) => {
-  console.log(e)
-}
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
-    name: '', // 姓名
+    certificateStatus: '', // 姓名
+    major: '',
+    name: '',
+    staffNo: '',
+    verifierCertificateNo: '',
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
   }
-  list.value = props.list
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
   }
 }
-// 监听数据变化
-watch(
-  [() => props.list], ([newNums], [oldNums]) => {
-    list.value = newNums
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :pagination="false"
+        :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
@@ -131,6 +147,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 0b15289..07b439b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,10 +3,12 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../../standard_interface'
+import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: {
     type: String,
@@ -140,7 +142,7 @@
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
   organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
   category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
@@ -157,34 +159,20 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-const fileRef = ref() // 文件上传input
-const upload = () => {
-  fileRef.value.click()
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 标准实验室发生改变row类型
 interface rowReturn {
   phone: string
   director: string
+  name: string
+  organizeName: string
+  id: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
+// 实验室ref
+const laboratorydialog = ref()
+// 标准实验室点击
+const changeDeptList = () => {
+  laboratorydialog.value.initDialog()
 }
 // 标准实验室清空时
 const clearDeptList = () => {
@@ -205,6 +193,24 @@
 if (props.buttonType !== 'add') {
   getInfo()
 }
+// 计量人员组件
+const personListdialog = ref()
+// 点击选择负责人函数
+const personClick = () => {
+  personListdialog.value.initDialog()
+}
+// 选择负责人回调函数
+const personListAdd = (data: rowReturn) => {
+  formInline.value.standardOwner = data.id
+  formInline.value.standardOwnerName = data.name
+}
+// 选择完科室的回调函数
+const laboratoryListAdd = (data: rowReturn) => {
+  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratoryName = data.organizeName
+  formInline.value.laboratoryOwner = data.director
+  formInline.value.laboratoryOwnerContact = data.phone
+}
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -222,18 +228,17 @@
     <div class="info-content">
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
+                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -243,9 +248,10 @@
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model.trim="formInline.standardName"
-                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -253,9 +259,10 @@
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入项目编号'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -263,21 +270,23 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标项目'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入组织机构代码'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -288,49 +297,52 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标单位名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
-                size="default"
+            <el-form-item label="标准负责人:" prop="standardOwnerName">
+              <el-input
+                v-model.trim="formInline.standardOwnerName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="personClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
                 v-model="formInline.category"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择类别'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -340,6 +352,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -349,7 +362,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准等级'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -359,6 +372,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -368,7 +382,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择传递范围'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -377,6 +391,7 @@
                   v-for="item in transmitRangeList"
                   :key="item.id"
                   :label="item.name"
+                  clearable
                   :value="item.value"
                 />
               </el-select>
@@ -386,55 +401,57 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
+                type="date"
                 :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准科室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
-                size="default"
+              <el-input
+                v-model.trim="formInline.standardLaboratoryName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
-                @clear="clearDeptList"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeDeptList"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -442,20 +459,21 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
                 v-model.trim="formInline.managerState"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择管理状态'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -465,6 +483,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -474,7 +493,7 @@
               <el-select
                 v-model.trim="formInline.measureMajor"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择计量专业'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -484,6 +503,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -492,9 +512,10 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入考核单位'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -502,64 +523,67 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
-                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="2">
             <el-form-item label="环境条件" />
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
+            <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
+            <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
@@ -576,7 +600,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -592,7 +616,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input :placeholder="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -608,25 +632,25 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
+        <!-- <el-row :gutter="24">
           <el-col :span="3">
             <el-form-item label="附件:">
               <show-photo :minio-file-name="formInline.minioFileName" />
               <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
                 {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -634,6 +658,8 @@
       </el-form>
     </div>
   </app-container>
+  <person-list-dialog ref="personListdialog" @add="personListAdd" />
+  <laboratory-dialog ref="laboratorydialog" @add="laboratoryListAdd" />
 </template>
 
 <style lang="scss" scoped>
@@ -659,8 +685,4 @@
   border-radius: 10px;
   background-color: #fff;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
new file mode 100644
index 0000000..6024925
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -0,0 +1,148 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
new file mode 100644
index 0000000..c19de5d
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -0,0 +1,165 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUsersDept } from '@/api/device/standard'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  director: '',
+  ids: [],
+  limit: 20,
+  meterMajor: '',
+  offset: 1,
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '3',
+  pDeptId: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '科室编号',
+    value: 'organizeNo',
+  },
+  {
+    text: '科室名称',
+    value: 'organizeName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '行政职务',
+    value: 'administrationJobName',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getUsersDept(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    director: '',
+    ids: [],
+    limit: 20,
+    meterMajor: '',
+    createStartTime: '',
+    createEndTime: '',
+    offset: 1,
+    organizeName: '',
+    organizeNo: '',
+    organizeType: '3',
+    pDeptId: '',
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择科室')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeNo" placeholder="科室编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeName" placeholder="科室名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index bb89e24..e0409c5 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -29,7 +29,7 @@
     default: '',
   },
 })
-const emits = defineEmits(['changePage', 'addRow', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
+const emits = defineEmits(['changePage', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
 const searchQuery = ref({
   limit: 10,
   offset: 1,
@@ -45,14 +45,6 @@
   }
   emits('changePage', searchQuery)
 }
-// 点击增加行
-const addRow = () => {
-  emits('addRow')
-}
-// 点击删除行
-const deleteRow = () => {
-  emits('deleteRow', props.title)
-}
 // 多选发生改变
 const handleSelectionChange = (object: object[]) => {
   emits('handleSelectionChange', object, props.title)
@@ -64,41 +56,28 @@
 </script>
 
 <template>
-  <detail-block :title="title">
-    <template #btns>
-      <el-button v-if="buttonType !== 'detail'" type="info" :disabled="buttonType === 'detail'" @click="deleteRow">
-        删除行
-      </el-button>
-      <el-button v-if="buttonType !== 'detail'" type="primary" :disabled="buttonType === 'detail'" @click="addRow">
-        增加行
-      </el-button>
-    </template>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :prop="item.value">
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
-            <template #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-        <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
-        </template>
-      </el-table-column>
-    </el-table>
-  </detail-block>
+  <el-table
+    :data="list"
+    border
+    style="width: 100%;"
+    @selection-change="handleSelectionChange"
+  >
+    <el-table-column v-if="buttonType !== 'detail'" type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="(item, index) in columns" :key="index" align="center" :width="item.width" :label="item.text" :prop="item.value">
+      <template #header>
+        <span style="color: red;">*</span><span>{{ item.text }}</span>
+      </template>
+      <template v-if="item.text === '姓名' && buttonType !== 'detail' || item.text === '设备名称' && buttonType !== 'detail' || item.text === '文件名称' && buttonType !== 'detail'" #default="scope">
+        <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
+          <template #append>
+            <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
+              选择
+            </el-button>
+          </template>
+        </el-input>
+      </template>
+    </el-table-column>
+  </el-table>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
new file mode 100644
index 0000000..6453565
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -0,0 +1,169 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  effectiveStatus: '',
+  fileCode: '',
+  fileName: '',
+  fileNo: '',
+  fileType: '10',
+  formId: 'jlglwjsp',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  publishEndTime: '',
+  publishStartTime: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    effectiveStatus: '',
+    fileCode: '',
+    fileName: '',
+    fileNo: '',
+    fileType: '10',
+    formId: 'jlglwjsp',
+    ids: [],
+    limit: 20,
+    offset: 1,
+    publishEndTime: '',
+    publishStartTime: '',
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择文件" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.fileName"
+          placeholder="文件名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.fileNo"
+          placeholder="文件编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 81409c2..ff45abc 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -5,10 +5,12 @@
 import type { IOptions } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
-import userListDialog from '@/views/measure/person/components/userListDialog.vue'
+import userListDialog from './standardList/userListDialog.vue'
+import SelectDeviceDialog from './standardList/equipmentDialog.vue'
+import VerificationDialog from './standardList/verificationDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -59,6 +61,7 @@
 const close = () => {
   $router.back()
 }
+// 拿到formInline的数据
 const setData = (newValue: object) => {
   formInline.value = newValue
 }
@@ -68,71 +71,85 @@
   offset: 1,
 }
 // 关闭
+// 表头类型
 interface TableColumn {
   text: string
   value: string
   align: string
+  width?: string
 }
 
 interface checkedRecord {
   text: string
 }
-// 计量人员
-const measurementPersonnelColumns = ref<TableColumn[]>([
+// 计量人员表头
+const measurementPersonnelColumns = ref([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
-  { text: '工作部门', value: 'deptName', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书编号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
+// 计量人员数据
 const measurementPersonnel = ref<checkedRecord[]>([])
+// 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
-function fetchmeasurementPersonnel(query = { ...queryParams }) {
+// 计量人员发送请求获取数据
+function fetchmeasurementPersonnel() {
   measurementPersonnelLoading.value = true
-  measurementPersonnel.value = [{
-    text: 'xx',
-  }]
-  measurementPersonnelLoading.value = false
+  getuserListPage({ id: infoId.value }).then((res) => {
+    measurementPersonnel.value = res.data.rows
+    measurementPersonnelLoading.value = false
+  })
 }
 
-// 标准配套设备
+// 标准配套设备表头
 const corollaryEquipmentColumns = ref<TableColumn[]>([
-  { text: '设备名称', value: 'text', align: 'center' },
-  { text: '设备编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '测量范围', value: 'text', align: 'center' },
-  { text: '使用部门', value: 'text', align: 'center' },
-  { text: '检定时间', value: 'text', align: 'center' },
-  { text: '检定结果', value: 'text', align: 'center' },
-  { text: '有效日期', value: 'text', align: 'center' },
+  { text: '设备名称', value: 'name', align: 'center', width: '180' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDept', align: 'center' },
+  { text: '检定时间', value: 'mesureDate', align: 'center' },
+  { text: '检定结果', value: 'mesureResult', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
 ])
+// 标准配套设备数据
 const corollaryEquipment = ref<checkedRecord[]>([])
+// 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
+// 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
-  corollaryEquipment.value = [{
-    text: 'xx',
-  }]
-  corollaryEquipmentLoading.value = false
+  getEquipmentListPage({ id: infoId.value }).then((res) => {
+    corollaryEquipment.value = res.data.rows.map((item) => {
+      item.name = item.equipmentName
+      return item
+    })
+    corollaryEquipmentLoading.value = false
+  })
 }
 
 // 检定规程
 const regulationVerificationColumns = ref<TableColumn[]>([
-  { text: '文件名称', value: 'text', align: 'center' },
-  { text: '文件编号', value: 'text', align: 'center' },
-  { text: '文件号', value: 'text', align: 'center' },
-  { text: '实施时间', value: 'text', align: 'center' },
-  { text: '实施状态', value: 'text', align: 'center' },
+  { text: '文件名称', value: 'name', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
 const regulationVerification = ref<checkedRecord[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
-  regulationVerification.value = [{
-    text: 'xx',
-  }]
-  regulationVerificationLoading.value = false
+  getRegulationListPage({ id: infoId.value }).then((res) => {
+    regulationVerification.value = res.data.rows.map((item) => {
+      item.name = item.fileName
+      return item
+    })
+    regulationVerificationLoading.value = false
+  })
 }
 
 // 重复性考核记录
@@ -146,9 +163,7 @@
 const repetitiveRppraisalRecordLoading = ref(false)
 function fetchrepetitiveRppraisalRecord(query = { ...queryParams }) {
   repetitiveRppraisalRecordLoading.value = true
-  repetitiveRppraisalRecord.value = [{
-    text: 'xx',
-  }]
+  repetitiveRppraisalRecord.value = []
   repetitiveRppraisalRecordLoading.value = false
 }
 
@@ -163,9 +178,7 @@
 const stabilityAssessmentRecordLoading = ref(false)
 function fetchstabilityAssessmentRecord(query = { ...queryParams }) {
   stabilityAssessmentRecordLoading.value = true
-  stabilityAssessmentRecord.value = [{
-    text: 'xx',
-  }]
+  stabilityAssessmentRecord.value = []
   stabilityAssessmentRecordLoading.value = false
 }
 
@@ -181,25 +194,17 @@
 const certificateManagementLoading = ref(false)
 function fetchcertificateManagement(query = { ...queryParams }) {
   certificateManagementLoading.value = true
-  certificateManagement.value = [{
-    text: 'xx',
-  }]
+  certificateManagement.value = []
   certificateManagementLoading.value = false
 }
 // 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    // 打印
-
-  }
+const submitFormUpdate = () => {
+  formInline.value.id = infoId.value
+  getStandardLisUpdate(formInline.value).then((res) => {
+    if (res.code === 200) {
+      close()
+    }
+  })
 }
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -211,27 +216,23 @@
 })
 // 提交
 const submitForm = () => {
-  if (pageType.value === 'detail') { return submitFormDetail() }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    current.value = '基本信息'
-    console.log(baseInfoRef.value.submitForm(), '000')
-    baseInfoRef.value.submitForm().validate().then(() => {
-      pageType.value === 'add'
-        ? getStandardListAdd(formInline.value).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('新增成功')
-            close()
-          }
-        })
-        : submitFormDetail()
+  if (pageType.value === 'edit') { return submitFormUpdate() }
+  baseInfoRef.value.submitForm().validate().then(() => {
+    ElMessageBox.confirm(
+      '确认提交吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      getStandardListAdd(formInline.value).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('新增成功')
+          close()
+        }
+      })
     })
   })
 }
@@ -255,11 +256,24 @@
   regulationVerification.value.push({})
   // ElMessage.warning('请先选择上一条信息')
 }
+// 设备ref
+const selectDeviceDialog = ref()
+// 检定规程ref
+const verificationDialog = ref()
+// 点击表格中的选择按钮
 function selectPerson(index: number, text: string) {
   if (text === '姓名') {
     userListRef.value.initDialog()
     listIndex.value = index
   }
+  else if (text === '设备名称') {
+    selectDeviceDialog.value.initDialog()
+    listIndex.value = index
+  }
+  else if (text === '文件名称') {
+    verificationDialog.value.initDialog()
+    listIndex.value = index
+  }
 }
 // 多选框选中
 function handleSelectionChange(Array: object[], title: string) {
@@ -277,7 +291,17 @@
 const deleteRow = (title: string) => {
   if (title === '计量人员') {
     if (measurementPersonnelSelectionList.value.length > 0) {
-      measurementPersonnel.value = measurementPersonnel.value.filter(item => !measurementPersonnelSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        measurementPersonnel.value = measurementPersonnel.value.filter(item => !measurementPersonnelSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -285,7 +309,17 @@
   }
   else if (title === '标准配套设备') {
     if (corollaryEquipmentSelectionList.value.length > 0) {
-      corollaryEquipment.value = corollaryEquipment.value.filter(item => !corollaryEquipmentSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        corollaryEquipment.value = corollaryEquipment.value.filter(item => !corollaryEquipmentSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -293,7 +327,17 @@
   }
   else if (title === '检定规程') {
     if (regulationVerificationSelectionList.value.length > 0) {
-      regulationVerification.value = regulationVerification.value.filter(item => !regulationVerificationSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        regulationVerification.value = regulationVerification.value.filter(item => !regulationVerificationSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -304,15 +348,59 @@
 const confirmPerson = (object: object) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
+    measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
+    measurementPersonnel.value[listIndex.value].userId = object.id
+    setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
     ElMessage.warning('该人员已经存在')
     measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
+// 选择完设备后
+const selectDeviceList = (data: object) => {
+  if (!corollaryEquipment.value.includes(data)) {
+    corollaryEquipment.value[listIndex.value] = data
+    corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
+    corollaryEquipment.value[listIndex.value].equipmentId = data.id
+    corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
+  }
+  else {
+    ElMessage.warning('该设备已经存在')
+    corollaryEquipment.value.splice(listIndex.value, 1)
+  }
+}
+// 检定规程选择完成后
+const verificationList = (data: object) => {
+  if (!regulationVerification.value.includes(data)) {
+    regulationVerification.value[listIndex.value] = data
+    regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
+    regulationVerification.value[listIndex.value].verifyRegulationId = data.id
+    regulationVerification.value[listIndex.value].name = data.fileName
+    getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
+  }
+  else {
+    ElMessage.warning('该设备已经存在')
+    regulationVerification.value.splice(listIndex.value, 1)
+  }
+}
+
+// 增加行
+const addRow = (title: string) => {
+  if (title === '计量人员') {
+    measurementPersonnelAddRow()
+  }
+  else if (title === '标准配套设备') {
+    corollaryEquipmentAddRow()
+  }
+  else if (title === '检定规程') {
+    regulationVerificationAddRow()
+  }
+}
 onMounted(() => {
   if (pageType.value === 'detail') {
-    // fetchmeasurementPersonnel()  // 计量人员
+    fetchmeasurementPersonnel() // 计量人员
     fetchcorollaryEquipment() // 标准配套设备
     fetchregulationVerification() // 检定规程
     fetchrepetitiveRppraisalRecord() // 重复性考核记录
@@ -320,7 +408,7 @@
     fetchcertificateManagement() // 证书管理
   }
   else if (pageType.value === 'edit') {
-    // fetchmeasurementPersonnel()  // 计量人员
+    fetchmeasurementPersonnel() // 计量人员
     fetchcorollaryEquipment() // 标准配套设备
     fetchregulationVerification() // 检定规程
   }
@@ -351,7 +439,7 @@
       </template>
       <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
     </detail-page>
-    <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" title="">
+    <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" :title="pageType === 'detail' ? '' : current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
@@ -359,15 +447,27 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="current === '计量人员'" title="计量人员" :button-type="pageType" :columns="measurementPersonnelColumns" :list="measurementPersonnel" :loading="measurementPersonnelLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @add-row="measurementPersonnelAddRow" @handleSelectionChange="handleSelectionChange" @change-page="fetchmeasurementPersonnel" />
-      <template-table v-if="current === '标准配套设备'" title="标准配套设备" :button-type="pageType" :columns="corollaryEquipmentColumns" :list="corollaryEquipment" :loading="corollaryEquipmentLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @change-page="fetchcorollaryEquipment" @handleSelectionChange="handleSelectionChange" @add-row="corollaryEquipmentAddRow" />
-      <template-table v-if="current === '检定规程'" title="检定规程" :button-type="pageType" :columns="regulationVerificationColumns" :list="regulationVerification" :loading="corollaryEquipmentLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @change-page="fetchregulationVerification" @handleSelectionChange="handleSelectionChange" @add-row="regulationVerificationAddRow" />
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow(current)">
+          添加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteRow(current)">
+          删除行
+        </el-button>
+      </template>
+      <template-table v-if="current === '计量人员'" title="计量人员" :button-type="pageType" :columns="measurementPersonnelColumns" :list="measurementPersonnel" :loading="measurementPersonnelLoading" @selectPerson="selectPerson" @handleSelectionChange="handleSelectionChange" @change-page="fetchmeasurementPersonnel" />
+      <template-table v-if="current === '标准配套设备'" title="标准配套设备" :button-type="pageType" :columns="corollaryEquipmentColumns" :list="corollaryEquipment" :loading="corollaryEquipmentLoading" @selectPerson="selectPerson" @change-page="fetchcorollaryEquipment" @handleSelectionChange="handleSelectionChange" />
+      <template-table v-if="current === '检定规程'" title="检定规程" :button-type="pageType" :columns="regulationVerificationColumns" :list="regulationVerification" :loading="corollaryEquipmentLoading" @selectPerson="selectPerson" @change-page="fetchregulationVerification" @handleSelectionChange="handleSelectionChange" />
       <template-table v-if="current === '重复性考核记录'" title="重复性考核记录" :button-type="pageType" :columns="repetitiveRppraisalRecordColumns" :list="repetitiveRppraisalRecord" :loading="repetitiveRppraisalRecordLoading" @change-page="fetchrepetitiveRppraisalRecord" />
       <template-table v-if="current === '稳定性考核记录'" title="稳定性考核记录" :button-type="pageType" :columns="stabilityAssessmentRecordColumns" :list="stabilityAssessmentRecord" :loading="stabilityAssessmentRecordLoading" @change-page="fetchstabilityAssessmentRecord" />
       <template-table v-if="current === '证书管理'" title="证书管理" :button-type="pageType" :columns="certificateManagementColumns" :list="certificateManagement" :loading="certificateManagementLoading" @change-page="fetchcertificateManagement" />
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
-    <user-list-dialog ref="userListRef" :list="measurementPersonnel" @add="confirmPerson" />
+    <user-list-dialog ref="userListRef" @add="confirmPerson" />
+    <!-- 选择设备列表组件 -->
+    <select-device-dialog ref="selectDeviceDialog" @add="selectDeviceList" />
+    <!-- 选择检定规程列表组件 -->
+    <verification-dialog ref="verificationDialog" @add="verificationList" />
   </app-container>
 </template>
 
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 5e7a7ca..9eefd7a 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -5,8 +5,8 @@
 import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
-import { exportExcel } from '@/utils/exportXlsx'
+import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
+import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
@@ -216,19 +216,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '到期提醒列表',
-      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else if (checkoutList.value.length > 0) {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '到期提醒列表',
-      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
+    getExportExcel(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '到期提醒列表.xlsx')
     })
   }
   else {

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
new file mode 100644
index 0000000..bbf753f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -0,0 +1,187 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getStandardList } from '@/api/device/standard'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  category: '', // 类别
+  id: '',
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
+})
+const loadingTable = ref<boolean>(false)
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+}
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<columnsType[]>([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    align: 'center',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '标准等级',
+    value: 'standardLevelName',
+    align: 'center',
+  },
+  {
+    text: '传递范围',
+    value: 'transmitRangeName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  }])
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStandardList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    category: '', // 类别
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 9a9c992..7e02e2f 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -1,129 +1,145 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
+import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const props = defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-
 // 查询条件
 const listQuery = ref({
-  name: '', // 姓名
+  certificateStatus: '', // 姓名
+  major: '',
+  name: '',
+  staffNo: '',
+  verifierCertificateNo: '',
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
 })
 const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
+const columns = ref([
   {
-    text: '设备名称',
+    text: '姓名',
     value: 'name',
-    align: 'center',
   },
   {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
+    text: '人员编号',
+    value: 'staffNo',
   },
   {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
+    text: '所在部门',
+    value: 'deptId',
   },
   {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
+    text: '行政职务',
+    value: 'administrationJob',
   },
 ])
-const list = ref<object[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = res.data.total
+    }
+  })
+}
 // 搜索
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  fetchData()
 }
-const changePage = (e: any) => {
-  console.log(e)
-}
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
-    name: '', // 姓名
+    certificateStatus: '', // 姓名
+    major: '',
+    name: '',
+    staffNo: '',
+    verifierCertificateNo: '',
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
   }
-  list.value = props.list
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
   }
 }
-// 监听数据变化
-watch(
-  [() => props.list], ([newNums], [oldNums]) => {
-    list.value = newNums
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :pagination="false"
+        :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
@@ -131,6 +147,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 0b15289..07b439b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,10 +3,12 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../../standard_interface'
+import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: {
     type: String,
@@ -140,7 +142,7 @@
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
   organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
   category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
@@ -157,34 +159,20 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-const fileRef = ref() // 文件上传input
-const upload = () => {
-  fileRef.value.click()
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 标准实验室发生改变row类型
 interface rowReturn {
   phone: string
   director: string
+  name: string
+  organizeName: string
+  id: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
+// 实验室ref
+const laboratorydialog = ref()
+// 标准实验室点击
+const changeDeptList = () => {
+  laboratorydialog.value.initDialog()
 }
 // 标准实验室清空时
 const clearDeptList = () => {
@@ -205,6 +193,24 @@
 if (props.buttonType !== 'add') {
   getInfo()
 }
+// 计量人员组件
+const personListdialog = ref()
+// 点击选择负责人函数
+const personClick = () => {
+  personListdialog.value.initDialog()
+}
+// 选择负责人回调函数
+const personListAdd = (data: rowReturn) => {
+  formInline.value.standardOwner = data.id
+  formInline.value.standardOwnerName = data.name
+}
+// 选择完科室的回调函数
+const laboratoryListAdd = (data: rowReturn) => {
+  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratoryName = data.organizeName
+  formInline.value.laboratoryOwner = data.director
+  formInline.value.laboratoryOwnerContact = data.phone
+}
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -222,18 +228,17 @@
     <div class="info-content">
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
+                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -243,9 +248,10 @@
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model.trim="formInline.standardName"
-                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -253,9 +259,10 @@
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入项目编号'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -263,21 +270,23 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标项目'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入组织机构代码'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -288,49 +297,52 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标单位名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
-                size="default"
+            <el-form-item label="标准负责人:" prop="standardOwnerName">
+              <el-input
+                v-model.trim="formInline.standardOwnerName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="personClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
                 v-model="formInline.category"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择类别'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -340,6 +352,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -349,7 +362,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准等级'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -359,6 +372,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -368,7 +382,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择传递范围'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -377,6 +391,7 @@
                   v-for="item in transmitRangeList"
                   :key="item.id"
                   :label="item.name"
+                  clearable
                   :value="item.value"
                 />
               </el-select>
@@ -386,55 +401,57 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
+                type="date"
                 :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准科室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
-                size="default"
+              <el-input
+                v-model.trim="formInline.standardLaboratoryName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
-                @clear="clearDeptList"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeDeptList"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -442,20 +459,21 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
                 v-model.trim="formInline.managerState"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择管理状态'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -465,6 +483,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -474,7 +493,7 @@
               <el-select
                 v-model.trim="formInline.measureMajor"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择计量专业'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -484,6 +503,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -492,9 +512,10 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入考核单位'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -502,64 +523,67 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
-                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="2">
             <el-form-item label="环境条件" />
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
+            <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
+            <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
@@ -576,7 +600,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -592,7 +616,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input :placeholder="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -608,25 +632,25 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
+        <!-- <el-row :gutter="24">
           <el-col :span="3">
             <el-form-item label="附件:">
               <show-photo :minio-file-name="formInline.minioFileName" />
               <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
                 {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -634,6 +658,8 @@
       </el-form>
     </div>
   </app-container>
+  <person-list-dialog ref="personListdialog" @add="personListAdd" />
+  <laboratory-dialog ref="laboratorydialog" @add="laboratoryListAdd" />
 </template>
 
 <style lang="scss" scoped>
@@ -659,8 +685,4 @@
   border-radius: 10px;
   background-color: #fff;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
new file mode 100644
index 0000000..6024925
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -0,0 +1,148 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
new file mode 100644
index 0000000..c19de5d
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -0,0 +1,165 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUsersDept } from '@/api/device/standard'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  director: '',
+  ids: [],
+  limit: 20,
+  meterMajor: '',
+  offset: 1,
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '3',
+  pDeptId: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '科室编号',
+    value: 'organizeNo',
+  },
+  {
+    text: '科室名称',
+    value: 'organizeName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '行政职务',
+    value: 'administrationJobName',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getUsersDept(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    director: '',
+    ids: [],
+    limit: 20,
+    meterMajor: '',
+    createStartTime: '',
+    createEndTime: '',
+    offset: 1,
+    organizeName: '',
+    organizeNo: '',
+    organizeType: '3',
+    pDeptId: '',
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择科室')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeNo" placeholder="科室编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeName" placeholder="科室名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index bb89e24..e0409c5 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -29,7 +29,7 @@
     default: '',
   },
 })
-const emits = defineEmits(['changePage', 'addRow', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
+const emits = defineEmits(['changePage', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
 const searchQuery = ref({
   limit: 10,
   offset: 1,
@@ -45,14 +45,6 @@
   }
   emits('changePage', searchQuery)
 }
-// 点击增加行
-const addRow = () => {
-  emits('addRow')
-}
-// 点击删除行
-const deleteRow = () => {
-  emits('deleteRow', props.title)
-}
 // 多选发生改变
 const handleSelectionChange = (object: object[]) => {
   emits('handleSelectionChange', object, props.title)
@@ -64,41 +56,28 @@
 </script>
 
 <template>
-  <detail-block :title="title">
-    <template #btns>
-      <el-button v-if="buttonType !== 'detail'" type="info" :disabled="buttonType === 'detail'" @click="deleteRow">
-        删除行
-      </el-button>
-      <el-button v-if="buttonType !== 'detail'" type="primary" :disabled="buttonType === 'detail'" @click="addRow">
-        增加行
-      </el-button>
-    </template>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :prop="item.value">
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
-            <template #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-        <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
-        </template>
-      </el-table-column>
-    </el-table>
-  </detail-block>
+  <el-table
+    :data="list"
+    border
+    style="width: 100%;"
+    @selection-change="handleSelectionChange"
+  >
+    <el-table-column v-if="buttonType !== 'detail'" type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="(item, index) in columns" :key="index" align="center" :width="item.width" :label="item.text" :prop="item.value">
+      <template #header>
+        <span style="color: red;">*</span><span>{{ item.text }}</span>
+      </template>
+      <template v-if="item.text === '姓名' && buttonType !== 'detail' || item.text === '设备名称' && buttonType !== 'detail' || item.text === '文件名称' && buttonType !== 'detail'" #default="scope">
+        <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
+          <template #append>
+            <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
+              选择
+            </el-button>
+          </template>
+        </el-input>
+      </template>
+    </el-table-column>
+  </el-table>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
new file mode 100644
index 0000000..6453565
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -0,0 +1,169 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  effectiveStatus: '',
+  fileCode: '',
+  fileName: '',
+  fileNo: '',
+  fileType: '10',
+  formId: 'jlglwjsp',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  publishEndTime: '',
+  publishStartTime: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    effectiveStatus: '',
+    fileCode: '',
+    fileName: '',
+    fileNo: '',
+    fileType: '10',
+    formId: 'jlglwjsp',
+    ids: [],
+    limit: 20,
+    offset: 1,
+    publishEndTime: '',
+    publishStartTime: '',
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择文件" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.fileName"
+          placeholder="文件名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.fileNo"
+          placeholder="文件编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 81409c2..ff45abc 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -5,10 +5,12 @@
 import type { IOptions } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
-import userListDialog from '@/views/measure/person/components/userListDialog.vue'
+import userListDialog from './standardList/userListDialog.vue'
+import SelectDeviceDialog from './standardList/equipmentDialog.vue'
+import VerificationDialog from './standardList/verificationDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -59,6 +61,7 @@
 const close = () => {
   $router.back()
 }
+// 拿到formInline的数据
 const setData = (newValue: object) => {
   formInline.value = newValue
 }
@@ -68,71 +71,85 @@
   offset: 1,
 }
 // 关闭
+// 表头类型
 interface TableColumn {
   text: string
   value: string
   align: string
+  width?: string
 }
 
 interface checkedRecord {
   text: string
 }
-// 计量人员
-const measurementPersonnelColumns = ref<TableColumn[]>([
+// 计量人员表头
+const measurementPersonnelColumns = ref([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
-  { text: '工作部门', value: 'deptName', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书编号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
+// 计量人员数据
 const measurementPersonnel = ref<checkedRecord[]>([])
+// 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
-function fetchmeasurementPersonnel(query = { ...queryParams }) {
+// 计量人员发送请求获取数据
+function fetchmeasurementPersonnel() {
   measurementPersonnelLoading.value = true
-  measurementPersonnel.value = [{
-    text: 'xx',
-  }]
-  measurementPersonnelLoading.value = false
+  getuserListPage({ id: infoId.value }).then((res) => {
+    measurementPersonnel.value = res.data.rows
+    measurementPersonnelLoading.value = false
+  })
 }
 
-// 标准配套设备
+// 标准配套设备表头
 const corollaryEquipmentColumns = ref<TableColumn[]>([
-  { text: '设备名称', value: 'text', align: 'center' },
-  { text: '设备编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '测量范围', value: 'text', align: 'center' },
-  { text: '使用部门', value: 'text', align: 'center' },
-  { text: '检定时间', value: 'text', align: 'center' },
-  { text: '检定结果', value: 'text', align: 'center' },
-  { text: '有效日期', value: 'text', align: 'center' },
+  { text: '设备名称', value: 'name', align: 'center', width: '180' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDept', align: 'center' },
+  { text: '检定时间', value: 'mesureDate', align: 'center' },
+  { text: '检定结果', value: 'mesureResult', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
 ])
+// 标准配套设备数据
 const corollaryEquipment = ref<checkedRecord[]>([])
+// 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
+// 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
-  corollaryEquipment.value = [{
-    text: 'xx',
-  }]
-  corollaryEquipmentLoading.value = false
+  getEquipmentListPage({ id: infoId.value }).then((res) => {
+    corollaryEquipment.value = res.data.rows.map((item) => {
+      item.name = item.equipmentName
+      return item
+    })
+    corollaryEquipmentLoading.value = false
+  })
 }
 
 // 检定规程
 const regulationVerificationColumns = ref<TableColumn[]>([
-  { text: '文件名称', value: 'text', align: 'center' },
-  { text: '文件编号', value: 'text', align: 'center' },
-  { text: '文件号', value: 'text', align: 'center' },
-  { text: '实施时间', value: 'text', align: 'center' },
-  { text: '实施状态', value: 'text', align: 'center' },
+  { text: '文件名称', value: 'name', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
 const regulationVerification = ref<checkedRecord[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
-  regulationVerification.value = [{
-    text: 'xx',
-  }]
-  regulationVerificationLoading.value = false
+  getRegulationListPage({ id: infoId.value }).then((res) => {
+    regulationVerification.value = res.data.rows.map((item) => {
+      item.name = item.fileName
+      return item
+    })
+    regulationVerificationLoading.value = false
+  })
 }
 
 // 重复性考核记录
@@ -146,9 +163,7 @@
 const repetitiveRppraisalRecordLoading = ref(false)
 function fetchrepetitiveRppraisalRecord(query = { ...queryParams }) {
   repetitiveRppraisalRecordLoading.value = true
-  repetitiveRppraisalRecord.value = [{
-    text: 'xx',
-  }]
+  repetitiveRppraisalRecord.value = []
   repetitiveRppraisalRecordLoading.value = false
 }
 
@@ -163,9 +178,7 @@
 const stabilityAssessmentRecordLoading = ref(false)
 function fetchstabilityAssessmentRecord(query = { ...queryParams }) {
   stabilityAssessmentRecordLoading.value = true
-  stabilityAssessmentRecord.value = [{
-    text: 'xx',
-  }]
+  stabilityAssessmentRecord.value = []
   stabilityAssessmentRecordLoading.value = false
 }
 
@@ -181,25 +194,17 @@
 const certificateManagementLoading = ref(false)
 function fetchcertificateManagement(query = { ...queryParams }) {
   certificateManagementLoading.value = true
-  certificateManagement.value = [{
-    text: 'xx',
-  }]
+  certificateManagement.value = []
   certificateManagementLoading.value = false
 }
 // 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    // 打印
-
-  }
+const submitFormUpdate = () => {
+  formInline.value.id = infoId.value
+  getStandardLisUpdate(formInline.value).then((res) => {
+    if (res.code === 200) {
+      close()
+    }
+  })
 }
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -211,27 +216,23 @@
 })
 // 提交
 const submitForm = () => {
-  if (pageType.value === 'detail') { return submitFormDetail() }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    current.value = '基本信息'
-    console.log(baseInfoRef.value.submitForm(), '000')
-    baseInfoRef.value.submitForm().validate().then(() => {
-      pageType.value === 'add'
-        ? getStandardListAdd(formInline.value).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('新增成功')
-            close()
-          }
-        })
-        : submitFormDetail()
+  if (pageType.value === 'edit') { return submitFormUpdate() }
+  baseInfoRef.value.submitForm().validate().then(() => {
+    ElMessageBox.confirm(
+      '确认提交吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      getStandardListAdd(formInline.value).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('新增成功')
+          close()
+        }
+      })
     })
   })
 }
@@ -255,11 +256,24 @@
   regulationVerification.value.push({})
   // ElMessage.warning('请先选择上一条信息')
 }
+// 设备ref
+const selectDeviceDialog = ref()
+// 检定规程ref
+const verificationDialog = ref()
+// 点击表格中的选择按钮
 function selectPerson(index: number, text: string) {
   if (text === '姓名') {
     userListRef.value.initDialog()
     listIndex.value = index
   }
+  else if (text === '设备名称') {
+    selectDeviceDialog.value.initDialog()
+    listIndex.value = index
+  }
+  else if (text === '文件名称') {
+    verificationDialog.value.initDialog()
+    listIndex.value = index
+  }
 }
 // 多选框选中
 function handleSelectionChange(Array: object[], title: string) {
@@ -277,7 +291,17 @@
 const deleteRow = (title: string) => {
   if (title === '计量人员') {
     if (measurementPersonnelSelectionList.value.length > 0) {
-      measurementPersonnel.value = measurementPersonnel.value.filter(item => !measurementPersonnelSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        measurementPersonnel.value = measurementPersonnel.value.filter(item => !measurementPersonnelSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -285,7 +309,17 @@
   }
   else if (title === '标准配套设备') {
     if (corollaryEquipmentSelectionList.value.length > 0) {
-      corollaryEquipment.value = corollaryEquipment.value.filter(item => !corollaryEquipmentSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        corollaryEquipment.value = corollaryEquipment.value.filter(item => !corollaryEquipmentSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -293,7 +327,17 @@
   }
   else if (title === '检定规程') {
     if (regulationVerificationSelectionList.value.length > 0) {
-      regulationVerification.value = regulationVerification.value.filter(item => !regulationVerificationSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        regulationVerification.value = regulationVerification.value.filter(item => !regulationVerificationSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -304,15 +348,59 @@
 const confirmPerson = (object: object) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
+    measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
+    measurementPersonnel.value[listIndex.value].userId = object.id
+    setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
     ElMessage.warning('该人员已经存在')
     measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
+// 选择完设备后
+const selectDeviceList = (data: object) => {
+  if (!corollaryEquipment.value.includes(data)) {
+    corollaryEquipment.value[listIndex.value] = data
+    corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
+    corollaryEquipment.value[listIndex.value].equipmentId = data.id
+    corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
+  }
+  else {
+    ElMessage.warning('该设备已经存在')
+    corollaryEquipment.value.splice(listIndex.value, 1)
+  }
+}
+// 检定规程选择完成后
+const verificationList = (data: object) => {
+  if (!regulationVerification.value.includes(data)) {
+    regulationVerification.value[listIndex.value] = data
+    regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
+    regulationVerification.value[listIndex.value].verifyRegulationId = data.id
+    regulationVerification.value[listIndex.value].name = data.fileName
+    getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
+  }
+  else {
+    ElMessage.warning('该设备已经存在')
+    regulationVerification.value.splice(listIndex.value, 1)
+  }
+}
+
+// 增加行
+const addRow = (title: string) => {
+  if (title === '计量人员') {
+    measurementPersonnelAddRow()
+  }
+  else if (title === '标准配套设备') {
+    corollaryEquipmentAddRow()
+  }
+  else if (title === '检定规程') {
+    regulationVerificationAddRow()
+  }
+}
 onMounted(() => {
   if (pageType.value === 'detail') {
-    // fetchmeasurementPersonnel()  // 计量人员
+    fetchmeasurementPersonnel() // 计量人员
     fetchcorollaryEquipment() // 标准配套设备
     fetchregulationVerification() // 检定规程
     fetchrepetitiveRppraisalRecord() // 重复性考核记录
@@ -320,7 +408,7 @@
     fetchcertificateManagement() // 证书管理
   }
   else if (pageType.value === 'edit') {
-    // fetchmeasurementPersonnel()  // 计量人员
+    fetchmeasurementPersonnel() // 计量人员
     fetchcorollaryEquipment() // 标准配套设备
     fetchregulationVerification() // 检定规程
   }
@@ -351,7 +439,7 @@
       </template>
       <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
     </detail-page>
-    <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" title="">
+    <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" :title="pageType === 'detail' ? '' : current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
@@ -359,15 +447,27 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="current === '计量人员'" title="计量人员" :button-type="pageType" :columns="measurementPersonnelColumns" :list="measurementPersonnel" :loading="measurementPersonnelLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @add-row="measurementPersonnelAddRow" @handleSelectionChange="handleSelectionChange" @change-page="fetchmeasurementPersonnel" />
-      <template-table v-if="current === '标准配套设备'" title="标准配套设备" :button-type="pageType" :columns="corollaryEquipmentColumns" :list="corollaryEquipment" :loading="corollaryEquipmentLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @change-page="fetchcorollaryEquipment" @handleSelectionChange="handleSelectionChange" @add-row="corollaryEquipmentAddRow" />
-      <template-table v-if="current === '检定规程'" title="检定规程" :button-type="pageType" :columns="regulationVerificationColumns" :list="regulationVerification" :loading="corollaryEquipmentLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @change-page="fetchregulationVerification" @handleSelectionChange="handleSelectionChange" @add-row="regulationVerificationAddRow" />
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow(current)">
+          添加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteRow(current)">
+          删除行
+        </el-button>
+      </template>
+      <template-table v-if="current === '计量人员'" title="计量人员" :button-type="pageType" :columns="measurementPersonnelColumns" :list="measurementPersonnel" :loading="measurementPersonnelLoading" @selectPerson="selectPerson" @handleSelectionChange="handleSelectionChange" @change-page="fetchmeasurementPersonnel" />
+      <template-table v-if="current === '标准配套设备'" title="标准配套设备" :button-type="pageType" :columns="corollaryEquipmentColumns" :list="corollaryEquipment" :loading="corollaryEquipmentLoading" @selectPerson="selectPerson" @change-page="fetchcorollaryEquipment" @handleSelectionChange="handleSelectionChange" />
+      <template-table v-if="current === '检定规程'" title="检定规程" :button-type="pageType" :columns="regulationVerificationColumns" :list="regulationVerification" :loading="corollaryEquipmentLoading" @selectPerson="selectPerson" @change-page="fetchregulationVerification" @handleSelectionChange="handleSelectionChange" />
       <template-table v-if="current === '重复性考核记录'" title="重复性考核记录" :button-type="pageType" :columns="repetitiveRppraisalRecordColumns" :list="repetitiveRppraisalRecord" :loading="repetitiveRppraisalRecordLoading" @change-page="fetchrepetitiveRppraisalRecord" />
       <template-table v-if="current === '稳定性考核记录'" title="稳定性考核记录" :button-type="pageType" :columns="stabilityAssessmentRecordColumns" :list="stabilityAssessmentRecord" :loading="stabilityAssessmentRecordLoading" @change-page="fetchstabilityAssessmentRecord" />
       <template-table v-if="current === '证书管理'" title="证书管理" :button-type="pageType" :columns="certificateManagementColumns" :list="certificateManagement" :loading="certificateManagementLoading" @change-page="fetchcertificateManagement" />
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
-    <user-list-dialog ref="userListRef" :list="measurementPersonnel" @add="confirmPerson" />
+    <user-list-dialog ref="userListRef" @add="confirmPerson" />
+    <!-- 选择设备列表组件 -->
+    <select-device-dialog ref="selectDeviceDialog" @add="selectDeviceList" />
+    <!-- 选择检定规程列表组件 -->
+    <verification-dialog ref="verificationDialog" @add="verificationList" />
   </app-container>
 </template>
 
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 5e7a7ca..9eefd7a 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -5,8 +5,8 @@
 import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
-import { exportExcel } from '@/utils/exportXlsx'
+import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
+import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
@@ -216,19 +216,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '到期提醒列表',
-      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else if (checkoutList.value.length > 0) {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '到期提醒列表',
-      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
+    getExportExcel(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '到期提醒列表.xlsx')
     })
   }
   else {
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 216f572..9ea0948 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -5,22 +5,27 @@
 import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
-import { exportExcel } from '@/utils/exportXlsx'
+import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 // 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
-  standardNo: '', // 标准代码
-  standardName: '', // 标准名称
   category: '', // 类别
+  id: '',
   managerState: '', // 管理状态
-  standardLaboratory: '', // 标准所在部门
-  preparationDate: '', // 筹建日期
-  id: null,
-  offset: 1, // 当前页
-  limit: 20, // 多少条
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
 })
+// 筹建日期
+const preparationDate = ref('')
 const list = ref([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -99,6 +104,9 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 筹建日期
+  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -136,7 +144,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -149,15 +157,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
-    preparationDate: '',
-    id: null,
-    offset: 1,
-    limit: 10,
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
   }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -168,6 +179,7 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
+  // 发送请求
   fetchData(true)
 }
 // 多选发生改变时
@@ -198,27 +210,30 @@
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, categoryName: item.categoryName, standardLevel: item.standardLevel, transmitRange: item.transmitRange, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '标准装置列表',
-      titleArr: ['序号', '标准代码', '标准名称', '类别', '标准等级', '传递范围', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else if (checkoutList.value.length > 0) {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, categoryName: item.categoryName, standardLevel: item.standardLevel, transmitRange: item.transmitRange, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '标准装置列表',
-      titleArr: ['序号', '标准代码', '标准名称', '类别', '标准等级', '传递范围', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
+  if (list.value.length > 0) {
+    const params = {
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 	主键
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 筹建结束日期
+      preparationStartDate: listQuery.value.preparationStartDate, // 筹建结束日期
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在实验室
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准代码
+      validEndTime: listQuery.value.validEndTime, // 到期结束日期
+      validStartTime: listQuery.value.validStartTime, // 到期开始日期
+      ids: checkoutList.value,
+    }
+    getExportExcel(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '标准装置列表.xlsx')
     })
   }
   else {
-    ElMessage.warning('暂无数据')
+    ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
@@ -274,21 +289,21 @@
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
-      <search-item style="width: 15%;">
+      <search-item>
         <el-input
           v-model.trim="listQuery.standardNo"
           placeholder="标准代码"
           clearable
         />
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-input
           v-model.trim="listQuery.standardName"
           placeholder="标准名称"
           clearable
         />
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-select
           v-model.trim="listQuery.category"
           clearable
@@ -303,7 +318,7 @@
           />
         </el-select>
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-select
           v-model.trim="listQuery.managerState"
           clearable
@@ -318,7 +333,7 @@
           />
         </el-select>
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-select
           v-model="listQuery.standardLaboratory"
           clearable
@@ -333,14 +348,15 @@
           />
         </el-select>
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="preparationDate"
+          type="daterange"
+          range-separator="到"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="筹建日期开始日期"
+          end-placeholder="筹建日期结束日期"
         />
       </search-item>
     </search-area>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
new file mode 100644
index 0000000..bbf753f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -0,0 +1,187 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getStandardList } from '@/api/device/standard'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  category: '', // 类别
+  id: '',
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
+})
+const loadingTable = ref<boolean>(false)
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+}
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<columnsType[]>([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    align: 'center',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '标准等级',
+    value: 'standardLevelName',
+    align: 'center',
+  },
+  {
+    text: '传递范围',
+    value: 'transmitRangeName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  }])
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStandardList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    category: '', // 类别
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 9a9c992..7e02e2f 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -1,129 +1,145 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
+import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const props = defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-
 // 查询条件
 const listQuery = ref({
-  name: '', // 姓名
+  certificateStatus: '', // 姓名
+  major: '',
+  name: '',
+  staffNo: '',
+  verifierCertificateNo: '',
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
 })
 const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
+const columns = ref([
   {
-    text: '设备名称',
+    text: '姓名',
     value: 'name',
-    align: 'center',
   },
   {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
+    text: '人员编号',
+    value: 'staffNo',
   },
   {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
+    text: '所在部门',
+    value: 'deptId',
   },
   {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
+    text: '行政职务',
+    value: 'administrationJob',
   },
 ])
-const list = ref<object[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = res.data.total
+    }
+  })
+}
 // 搜索
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  fetchData()
 }
-const changePage = (e: any) => {
-  console.log(e)
-}
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
-    name: '', // 姓名
+    certificateStatus: '', // 姓名
+    major: '',
+    name: '',
+    staffNo: '',
+    verifierCertificateNo: '',
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
   }
-  list.value = props.list
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
   }
 }
-// 监听数据变化
-watch(
-  [() => props.list], ([newNums], [oldNums]) => {
-    list.value = newNums
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :pagination="false"
+        :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
@@ -131,6 +147,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 0b15289..07b439b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,10 +3,12 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../../standard_interface'
+import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: {
     type: String,
@@ -140,7 +142,7 @@
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
   organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
   category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
@@ -157,34 +159,20 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-const fileRef = ref() // 文件上传input
-const upload = () => {
-  fileRef.value.click()
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 标准实验室发生改变row类型
 interface rowReturn {
   phone: string
   director: string
+  name: string
+  organizeName: string
+  id: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
+// 实验室ref
+const laboratorydialog = ref()
+// 标准实验室点击
+const changeDeptList = () => {
+  laboratorydialog.value.initDialog()
 }
 // 标准实验室清空时
 const clearDeptList = () => {
@@ -205,6 +193,24 @@
 if (props.buttonType !== 'add') {
   getInfo()
 }
+// 计量人员组件
+const personListdialog = ref()
+// 点击选择负责人函数
+const personClick = () => {
+  personListdialog.value.initDialog()
+}
+// 选择负责人回调函数
+const personListAdd = (data: rowReturn) => {
+  formInline.value.standardOwner = data.id
+  formInline.value.standardOwnerName = data.name
+}
+// 选择完科室的回调函数
+const laboratoryListAdd = (data: rowReturn) => {
+  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratoryName = data.organizeName
+  formInline.value.laboratoryOwner = data.director
+  formInline.value.laboratoryOwnerContact = data.phone
+}
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -222,18 +228,17 @@
     <div class="info-content">
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
+                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -243,9 +248,10 @@
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model.trim="formInline.standardName"
-                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -253,9 +259,10 @@
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入项目编号'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -263,21 +270,23 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标项目'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入组织机构代码'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -288,49 +297,52 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标单位名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
-                size="default"
+            <el-form-item label="标准负责人:" prop="standardOwnerName">
+              <el-input
+                v-model.trim="formInline.standardOwnerName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="personClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
                 v-model="formInline.category"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择类别'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -340,6 +352,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -349,7 +362,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准等级'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -359,6 +372,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -368,7 +382,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择传递范围'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -377,6 +391,7 @@
                   v-for="item in transmitRangeList"
                   :key="item.id"
                   :label="item.name"
+                  clearable
                   :value="item.value"
                 />
               </el-select>
@@ -386,55 +401,57 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
+                type="date"
                 :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准科室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
-                size="default"
+              <el-input
+                v-model.trim="formInline.standardLaboratoryName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
-                @clear="clearDeptList"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeDeptList"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -442,20 +459,21 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
                 v-model.trim="formInline.managerState"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择管理状态'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -465,6 +483,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -474,7 +493,7 @@
               <el-select
                 v-model.trim="formInline.measureMajor"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择计量专业'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -484,6 +503,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -492,9 +512,10 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入考核单位'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -502,64 +523,67 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
-                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="2">
             <el-form-item label="环境条件" />
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
+            <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
+            <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
@@ -576,7 +600,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -592,7 +616,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input :placeholder="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -608,25 +632,25 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
+        <!-- <el-row :gutter="24">
           <el-col :span="3">
             <el-form-item label="附件:">
               <show-photo :minio-file-name="formInline.minioFileName" />
               <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
                 {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -634,6 +658,8 @@
       </el-form>
     </div>
   </app-container>
+  <person-list-dialog ref="personListdialog" @add="personListAdd" />
+  <laboratory-dialog ref="laboratorydialog" @add="laboratoryListAdd" />
 </template>
 
 <style lang="scss" scoped>
@@ -659,8 +685,4 @@
   border-radius: 10px;
   background-color: #fff;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
new file mode 100644
index 0000000..6024925
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -0,0 +1,148 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
new file mode 100644
index 0000000..c19de5d
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -0,0 +1,165 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUsersDept } from '@/api/device/standard'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  director: '',
+  ids: [],
+  limit: 20,
+  meterMajor: '',
+  offset: 1,
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '3',
+  pDeptId: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '科室编号',
+    value: 'organizeNo',
+  },
+  {
+    text: '科室名称',
+    value: 'organizeName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '行政职务',
+    value: 'administrationJobName',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getUsersDept(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    director: '',
+    ids: [],
+    limit: 20,
+    meterMajor: '',
+    createStartTime: '',
+    createEndTime: '',
+    offset: 1,
+    organizeName: '',
+    organizeNo: '',
+    organizeType: '3',
+    pDeptId: '',
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择科室')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeNo" placeholder="科室编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeName" placeholder="科室名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index bb89e24..e0409c5 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -29,7 +29,7 @@
     default: '',
   },
 })
-const emits = defineEmits(['changePage', 'addRow', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
+const emits = defineEmits(['changePage', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
 const searchQuery = ref({
   limit: 10,
   offset: 1,
@@ -45,14 +45,6 @@
   }
   emits('changePage', searchQuery)
 }
-// 点击增加行
-const addRow = () => {
-  emits('addRow')
-}
-// 点击删除行
-const deleteRow = () => {
-  emits('deleteRow', props.title)
-}
 // 多选发生改变
 const handleSelectionChange = (object: object[]) => {
   emits('handleSelectionChange', object, props.title)
@@ -64,41 +56,28 @@
 </script>
 
 <template>
-  <detail-block :title="title">
-    <template #btns>
-      <el-button v-if="buttonType !== 'detail'" type="info" :disabled="buttonType === 'detail'" @click="deleteRow">
-        删除行
-      </el-button>
-      <el-button v-if="buttonType !== 'detail'" type="primary" :disabled="buttonType === 'detail'" @click="addRow">
-        增加行
-      </el-button>
-    </template>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :prop="item.value">
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
-            <template #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-        <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
-        </template>
-      </el-table-column>
-    </el-table>
-  </detail-block>
+  <el-table
+    :data="list"
+    border
+    style="width: 100%;"
+    @selection-change="handleSelectionChange"
+  >
+    <el-table-column v-if="buttonType !== 'detail'" type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="(item, index) in columns" :key="index" align="center" :width="item.width" :label="item.text" :prop="item.value">
+      <template #header>
+        <span style="color: red;">*</span><span>{{ item.text }}</span>
+      </template>
+      <template v-if="item.text === '姓名' && buttonType !== 'detail' || item.text === '设备名称' && buttonType !== 'detail' || item.text === '文件名称' && buttonType !== 'detail'" #default="scope">
+        <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
+          <template #append>
+            <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
+              选择
+            </el-button>
+          </template>
+        </el-input>
+      </template>
+    </el-table-column>
+  </el-table>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
new file mode 100644
index 0000000..6453565
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -0,0 +1,169 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  effectiveStatus: '',
+  fileCode: '',
+  fileName: '',
+  fileNo: '',
+  fileType: '10',
+  formId: 'jlglwjsp',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  publishEndTime: '',
+  publishStartTime: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    effectiveStatus: '',
+    fileCode: '',
+    fileName: '',
+    fileNo: '',
+    fileType: '10',
+    formId: 'jlglwjsp',
+    ids: [],
+    limit: 20,
+    offset: 1,
+    publishEndTime: '',
+    publishStartTime: '',
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择文件" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.fileName"
+          placeholder="文件名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.fileNo"
+          placeholder="文件编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 81409c2..ff45abc 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -5,10 +5,12 @@
 import type { IOptions } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
-import userListDialog from '@/views/measure/person/components/userListDialog.vue'
+import userListDialog from './standardList/userListDialog.vue'
+import SelectDeviceDialog from './standardList/equipmentDialog.vue'
+import VerificationDialog from './standardList/verificationDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -59,6 +61,7 @@
 const close = () => {
   $router.back()
 }
+// 拿到formInline的数据
 const setData = (newValue: object) => {
   formInline.value = newValue
 }
@@ -68,71 +71,85 @@
   offset: 1,
 }
 // 关闭
+// 表头类型
 interface TableColumn {
   text: string
   value: string
   align: string
+  width?: string
 }
 
 interface checkedRecord {
   text: string
 }
-// 计量人员
-const measurementPersonnelColumns = ref<TableColumn[]>([
+// 计量人员表头
+const measurementPersonnelColumns = ref([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
-  { text: '工作部门', value: 'deptName', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书编号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
+// 计量人员数据
 const measurementPersonnel = ref<checkedRecord[]>([])
+// 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
-function fetchmeasurementPersonnel(query = { ...queryParams }) {
+// 计量人员发送请求获取数据
+function fetchmeasurementPersonnel() {
   measurementPersonnelLoading.value = true
-  measurementPersonnel.value = [{
-    text: 'xx',
-  }]
-  measurementPersonnelLoading.value = false
+  getuserListPage({ id: infoId.value }).then((res) => {
+    measurementPersonnel.value = res.data.rows
+    measurementPersonnelLoading.value = false
+  })
 }
 
-// 标准配套设备
+// 标准配套设备表头
 const corollaryEquipmentColumns = ref<TableColumn[]>([
-  { text: '设备名称', value: 'text', align: 'center' },
-  { text: '设备编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '测量范围', value: 'text', align: 'center' },
-  { text: '使用部门', value: 'text', align: 'center' },
-  { text: '检定时间', value: 'text', align: 'center' },
-  { text: '检定结果', value: 'text', align: 'center' },
-  { text: '有效日期', value: 'text', align: 'center' },
+  { text: '设备名称', value: 'name', align: 'center', width: '180' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDept', align: 'center' },
+  { text: '检定时间', value: 'mesureDate', align: 'center' },
+  { text: '检定结果', value: 'mesureResult', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
 ])
+// 标准配套设备数据
 const corollaryEquipment = ref<checkedRecord[]>([])
+// 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
+// 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
-  corollaryEquipment.value = [{
-    text: 'xx',
-  }]
-  corollaryEquipmentLoading.value = false
+  getEquipmentListPage({ id: infoId.value }).then((res) => {
+    corollaryEquipment.value = res.data.rows.map((item) => {
+      item.name = item.equipmentName
+      return item
+    })
+    corollaryEquipmentLoading.value = false
+  })
 }
 
 // 检定规程
 const regulationVerificationColumns = ref<TableColumn[]>([
-  { text: '文件名称', value: 'text', align: 'center' },
-  { text: '文件编号', value: 'text', align: 'center' },
-  { text: '文件号', value: 'text', align: 'center' },
-  { text: '实施时间', value: 'text', align: 'center' },
-  { text: '实施状态', value: 'text', align: 'center' },
+  { text: '文件名称', value: 'name', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
 const regulationVerification = ref<checkedRecord[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
-  regulationVerification.value = [{
-    text: 'xx',
-  }]
-  regulationVerificationLoading.value = false
+  getRegulationListPage({ id: infoId.value }).then((res) => {
+    regulationVerification.value = res.data.rows.map((item) => {
+      item.name = item.fileName
+      return item
+    })
+    regulationVerificationLoading.value = false
+  })
 }
 
 // 重复性考核记录
@@ -146,9 +163,7 @@
 const repetitiveRppraisalRecordLoading = ref(false)
 function fetchrepetitiveRppraisalRecord(query = { ...queryParams }) {
   repetitiveRppraisalRecordLoading.value = true
-  repetitiveRppraisalRecord.value = [{
-    text: 'xx',
-  }]
+  repetitiveRppraisalRecord.value = []
   repetitiveRppraisalRecordLoading.value = false
 }
 
@@ -163,9 +178,7 @@
 const stabilityAssessmentRecordLoading = ref(false)
 function fetchstabilityAssessmentRecord(query = { ...queryParams }) {
   stabilityAssessmentRecordLoading.value = true
-  stabilityAssessmentRecord.value = [{
-    text: 'xx',
-  }]
+  stabilityAssessmentRecord.value = []
   stabilityAssessmentRecordLoading.value = false
 }
 
@@ -181,25 +194,17 @@
 const certificateManagementLoading = ref(false)
 function fetchcertificateManagement(query = { ...queryParams }) {
   certificateManagementLoading.value = true
-  certificateManagement.value = [{
-    text: 'xx',
-  }]
+  certificateManagement.value = []
   certificateManagementLoading.value = false
 }
 // 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    // 打印
-
-  }
+const submitFormUpdate = () => {
+  formInline.value.id = infoId.value
+  getStandardLisUpdate(formInline.value).then((res) => {
+    if (res.code === 200) {
+      close()
+    }
+  })
 }
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -211,27 +216,23 @@
 })
 // 提交
 const submitForm = () => {
-  if (pageType.value === 'detail') { return submitFormDetail() }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    current.value = '基本信息'
-    console.log(baseInfoRef.value.submitForm(), '000')
-    baseInfoRef.value.submitForm().validate().then(() => {
-      pageType.value === 'add'
-        ? getStandardListAdd(formInline.value).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('新增成功')
-            close()
-          }
-        })
-        : submitFormDetail()
+  if (pageType.value === 'edit') { return submitFormUpdate() }
+  baseInfoRef.value.submitForm().validate().then(() => {
+    ElMessageBox.confirm(
+      '确认提交吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      getStandardListAdd(formInline.value).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('新增成功')
+          close()
+        }
+      })
     })
   })
 }
@@ -255,11 +256,24 @@
   regulationVerification.value.push({})
   // ElMessage.warning('请先选择上一条信息')
 }
+// 设备ref
+const selectDeviceDialog = ref()
+// 检定规程ref
+const verificationDialog = ref()
+// 点击表格中的选择按钮
 function selectPerson(index: number, text: string) {
   if (text === '姓名') {
     userListRef.value.initDialog()
     listIndex.value = index
   }
+  else if (text === '设备名称') {
+    selectDeviceDialog.value.initDialog()
+    listIndex.value = index
+  }
+  else if (text === '文件名称') {
+    verificationDialog.value.initDialog()
+    listIndex.value = index
+  }
 }
 // 多选框选中
 function handleSelectionChange(Array: object[], title: string) {
@@ -277,7 +291,17 @@
 const deleteRow = (title: string) => {
   if (title === '计量人员') {
     if (measurementPersonnelSelectionList.value.length > 0) {
-      measurementPersonnel.value = measurementPersonnel.value.filter(item => !measurementPersonnelSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        measurementPersonnel.value = measurementPersonnel.value.filter(item => !measurementPersonnelSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -285,7 +309,17 @@
   }
   else if (title === '标准配套设备') {
     if (corollaryEquipmentSelectionList.value.length > 0) {
-      corollaryEquipment.value = corollaryEquipment.value.filter(item => !corollaryEquipmentSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        corollaryEquipment.value = corollaryEquipment.value.filter(item => !corollaryEquipmentSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -293,7 +327,17 @@
   }
   else if (title === '检定规程') {
     if (regulationVerificationSelectionList.value.length > 0) {
-      regulationVerification.value = regulationVerification.value.filter(item => !regulationVerificationSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        regulationVerification.value = regulationVerification.value.filter(item => !regulationVerificationSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -304,15 +348,59 @@
 const confirmPerson = (object: object) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
+    measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
+    measurementPersonnel.value[listIndex.value].userId = object.id
+    setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
     ElMessage.warning('该人员已经存在')
     measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
+// 选择完设备后
+const selectDeviceList = (data: object) => {
+  if (!corollaryEquipment.value.includes(data)) {
+    corollaryEquipment.value[listIndex.value] = data
+    corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
+    corollaryEquipment.value[listIndex.value].equipmentId = data.id
+    corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
+  }
+  else {
+    ElMessage.warning('该设备已经存在')
+    corollaryEquipment.value.splice(listIndex.value, 1)
+  }
+}
+// 检定规程选择完成后
+const verificationList = (data: object) => {
+  if (!regulationVerification.value.includes(data)) {
+    regulationVerification.value[listIndex.value] = data
+    regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
+    regulationVerification.value[listIndex.value].verifyRegulationId = data.id
+    regulationVerification.value[listIndex.value].name = data.fileName
+    getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
+  }
+  else {
+    ElMessage.warning('该设备已经存在')
+    regulationVerification.value.splice(listIndex.value, 1)
+  }
+}
+
+// 增加行
+const addRow = (title: string) => {
+  if (title === '计量人员') {
+    measurementPersonnelAddRow()
+  }
+  else if (title === '标准配套设备') {
+    corollaryEquipmentAddRow()
+  }
+  else if (title === '检定规程') {
+    regulationVerificationAddRow()
+  }
+}
 onMounted(() => {
   if (pageType.value === 'detail') {
-    // fetchmeasurementPersonnel()  // 计量人员
+    fetchmeasurementPersonnel() // 计量人员
     fetchcorollaryEquipment() // 标准配套设备
     fetchregulationVerification() // 检定规程
     fetchrepetitiveRppraisalRecord() // 重复性考核记录
@@ -320,7 +408,7 @@
     fetchcertificateManagement() // 证书管理
   }
   else if (pageType.value === 'edit') {
-    // fetchmeasurementPersonnel()  // 计量人员
+    fetchmeasurementPersonnel() // 计量人员
     fetchcorollaryEquipment() // 标准配套设备
     fetchregulationVerification() // 检定规程
   }
@@ -351,7 +439,7 @@
       </template>
       <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
     </detail-page>
-    <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" title="">
+    <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" :title="pageType === 'detail' ? '' : current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
@@ -359,15 +447,27 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="current === '计量人员'" title="计量人员" :button-type="pageType" :columns="measurementPersonnelColumns" :list="measurementPersonnel" :loading="measurementPersonnelLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @add-row="measurementPersonnelAddRow" @handleSelectionChange="handleSelectionChange" @change-page="fetchmeasurementPersonnel" />
-      <template-table v-if="current === '标准配套设备'" title="标准配套设备" :button-type="pageType" :columns="corollaryEquipmentColumns" :list="corollaryEquipment" :loading="corollaryEquipmentLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @change-page="fetchcorollaryEquipment" @handleSelectionChange="handleSelectionChange" @add-row="corollaryEquipmentAddRow" />
-      <template-table v-if="current === '检定规程'" title="检定规程" :button-type="pageType" :columns="regulationVerificationColumns" :list="regulationVerification" :loading="corollaryEquipmentLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @change-page="fetchregulationVerification" @handleSelectionChange="handleSelectionChange" @add-row="regulationVerificationAddRow" />
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow(current)">
+          添加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteRow(current)">
+          删除行
+        </el-button>
+      </template>
+      <template-table v-if="current === '计量人员'" title="计量人员" :button-type="pageType" :columns="measurementPersonnelColumns" :list="measurementPersonnel" :loading="measurementPersonnelLoading" @selectPerson="selectPerson" @handleSelectionChange="handleSelectionChange" @change-page="fetchmeasurementPersonnel" />
+      <template-table v-if="current === '标准配套设备'" title="标准配套设备" :button-type="pageType" :columns="corollaryEquipmentColumns" :list="corollaryEquipment" :loading="corollaryEquipmentLoading" @selectPerson="selectPerson" @change-page="fetchcorollaryEquipment" @handleSelectionChange="handleSelectionChange" />
+      <template-table v-if="current === '检定规程'" title="检定规程" :button-type="pageType" :columns="regulationVerificationColumns" :list="regulationVerification" :loading="corollaryEquipmentLoading" @selectPerson="selectPerson" @change-page="fetchregulationVerification" @handleSelectionChange="handleSelectionChange" />
       <template-table v-if="current === '重复性考核记录'" title="重复性考核记录" :button-type="pageType" :columns="repetitiveRppraisalRecordColumns" :list="repetitiveRppraisalRecord" :loading="repetitiveRppraisalRecordLoading" @change-page="fetchrepetitiveRppraisalRecord" />
       <template-table v-if="current === '稳定性考核记录'" title="稳定性考核记录" :button-type="pageType" :columns="stabilityAssessmentRecordColumns" :list="stabilityAssessmentRecord" :loading="stabilityAssessmentRecordLoading" @change-page="fetchstabilityAssessmentRecord" />
       <template-table v-if="current === '证书管理'" title="证书管理" :button-type="pageType" :columns="certificateManagementColumns" :list="certificateManagement" :loading="certificateManagementLoading" @change-page="fetchcertificateManagement" />
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
-    <user-list-dialog ref="userListRef" :list="measurementPersonnel" @add="confirmPerson" />
+    <user-list-dialog ref="userListRef" @add="confirmPerson" />
+    <!-- 选择设备列表组件 -->
+    <select-device-dialog ref="selectDeviceDialog" @add="selectDeviceList" />
+    <!-- 选择检定规程列表组件 -->
+    <verification-dialog ref="verificationDialog" @add="verificationList" />
   </app-container>
 </template>
 
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 5e7a7ca..9eefd7a 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -5,8 +5,8 @@
 import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
-import { exportExcel } from '@/utils/exportXlsx'
+import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
+import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
@@ -216,19 +216,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '到期提醒列表',
-      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else if (checkoutList.value.length > 0) {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '到期提醒列表',
-      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
+    getExportExcel(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '到期提醒列表.xlsx')
     })
   }
   else {
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 216f572..9ea0948 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -5,22 +5,27 @@
 import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
-import { exportExcel } from '@/utils/exportXlsx'
+import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 // 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
-  standardNo: '', // 标准代码
-  standardName: '', // 标准名称
   category: '', // 类别
+  id: '',
   managerState: '', // 管理状态
-  standardLaboratory: '', // 标准所在部门
-  preparationDate: '', // 筹建日期
-  id: null,
-  offset: 1, // 当前页
-  limit: 20, // 多少条
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
 })
+// 筹建日期
+const preparationDate = ref('')
 const list = ref([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -99,6 +104,9 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 筹建日期
+  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -136,7 +144,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -149,15 +157,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
-    preparationDate: '',
-    id: null,
-    offset: 1,
-    limit: 10,
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
   }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -168,6 +179,7 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
+  // 发送请求
   fetchData(true)
 }
 // 多选发生改变时
@@ -198,27 +210,30 @@
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, categoryName: item.categoryName, standardLevel: item.standardLevel, transmitRange: item.transmitRange, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '标准装置列表',
-      titleArr: ['序号', '标准代码', '标准名称', '类别', '标准等级', '传递范围', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else if (checkoutList.value.length > 0) {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, categoryName: item.categoryName, standardLevel: item.standardLevel, transmitRange: item.transmitRange, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '标准装置列表',
-      titleArr: ['序号', '标准代码', '标准名称', '类别', '标准等级', '传递范围', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
+  if (list.value.length > 0) {
+    const params = {
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 	主键
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 筹建结束日期
+      preparationStartDate: listQuery.value.preparationStartDate, // 筹建结束日期
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在实验室
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准代码
+      validEndTime: listQuery.value.validEndTime, // 到期结束日期
+      validStartTime: listQuery.value.validStartTime, // 到期开始日期
+      ids: checkoutList.value,
+    }
+    getExportExcel(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '标准装置列表.xlsx')
     })
   }
   else {
-    ElMessage.warning('暂无数据')
+    ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
@@ -274,21 +289,21 @@
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
-      <search-item style="width: 15%;">
+      <search-item>
         <el-input
           v-model.trim="listQuery.standardNo"
           placeholder="标准代码"
           clearable
         />
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-input
           v-model.trim="listQuery.standardName"
           placeholder="标准名称"
           clearable
         />
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-select
           v-model.trim="listQuery.category"
           clearable
@@ -303,7 +318,7 @@
           />
         </el-select>
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-select
           v-model.trim="listQuery.managerState"
           clearable
@@ -318,7 +333,7 @@
           />
         </el-select>
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-select
           v-model="listQuery.standardLaboratory"
           clearable
@@ -333,14 +348,15 @@
           />
         </el-select>
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="preparationDate"
+          type="daterange"
+          range-separator="到"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="筹建日期开始日期"
+          end-placeholder="筹建日期结束日期"
         />
       </search-item>
     </search-area>
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 8917584..97c4b60 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -30,13 +30,16 @@
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  standardNo: string
-  standardName: string
   category: string
+  id: string
   managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
   standardLaboratory: string
-  preparationDate: string
-  id: null | string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
   offset: number
   limit: number
 }
@@ -80,7 +83,7 @@
 }
 
 // 按钮类型
-export interface Ibuttoms {
+export interface Ibuttons {
   type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   name: string
 }

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 6e6fdfa..655d6e7 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -127,3 +127,86 @@
   })
 }
 
+// 批量添加标准装置底部计量人员
+export function setBatchAdd(data: object) {
+  return request({
+    url: '/meter/standard/user/batchAdd',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-计量人员列表（分页）
+export function getuserListPage(data: object) {
+  return request({
+    url: '/meter/standard/user/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-删除计量人员
+export function getuserDelete(data: object) {
+  return request({
+    url: '/meter/standard/user/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-配套设备列表(分页)
+export function getEquipmentListPage(data: object) {
+  return request({
+    url: '/meter/standard/equipment/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加标准配套设备
+export function getEquipmenteAdd(data: object) {
+  return request({
+    url: '/meter/standard/equipment/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 添加检定规程
+export function getRegulationAdd(data: object) {
+  return request({
+    url: '/meter/standard/regulation/add',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置-检定规程列表（分页）
+export function getRegulationListPage(data: object) {
+  return request({
+    url: '/meter/standard/regulation/listPage',
+    method: 'post',
+    data,
+  })
+}
+
+// 标准装置导出
+export function getExportExcel(data: object) {
+  return request({
+    url: '/meter/standard/exportExcel',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
+// 标准装置申请导出
+export function getExportList(data: object) {
+  return request({
+    url: '/standard/exportList',
+    method: 'post',
+    responseType: 'blob',
+    data,
+  })
+}
+
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 5c85016..919591d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -196,6 +196,28 @@
           activeMenu: '/lab/deptMeasureList',
         },
       },
+      {
+        path: 'reportOnCredentialsApproval',
+        name: 'ReportOnCredentialsApproval',
+        component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
+        meta: {
+          title: '证书报告',
+          icon: 'ep:key',
+          auth: '/lab/reportOnCredentialsApproval',
+        },
+      },
+      {
+        path: 'reportOnCredentialsApproval/:type/:id?',
+        name: 'reportOnCredentialsAdd',
+        component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
+        meta: {
+          title: '检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/reportOnCredentialsApproval',
+        },
+      },
     ],
   },
 ]
diff --git a/src/views/business/bench/bench.vue b/src/views/business/bench/bench.vue
index 1f5af41..fad9269 100644
--- a/src/views/business/bench/bench.vue
+++ b/src/views/business/bench/bench.vue
@@ -243,7 +243,7 @@
     <el-row :gutter="10">
       <el-col :span="8">
         <bench-col
-          icon="icon-book"
+          icon="icon-file"
           title="样品监控"
           path-url="1"
           :height="blockHeight"
@@ -273,7 +273,7 @@
         </bench-col>
       </el-col>
       <el-col :span="8">
-        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="1">
+        <bench-col icon="icon-line" title="我的检测" :height="blockHeight" path-url="/lab/myMeasureList">
           <div class="my-tests">
             <div style="width: 60%;">
               <el-table
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
new file mode 100644
index 0000000..0b15289
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -0,0 +1,666 @@
+<script lang="ts" setup name="standardListAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../../standard_interface'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const props = defineProps({
+  infoId: {
+    type: String,
+    default: '0',
+  },
+  buttonType: {
+    type: String,
+    default: '',
+  },
+})
+const emit = defineEmits(['close', 'setData']) // 关闭
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  laboratoryOwnerName: null,
+  managerState: '',
+  managerStateName: '',
+  measureMajor: '',
+  fileList: [],
+  measureMajorName: '',
+  mesureRange: '',
+  organizeNo: '',
+  preparationDate: '',
+  projectNo: '',
+  remark: '',
+  standardHumidity: null,
+  standardLaboratory: '',
+  standardLaboratoryName: '',
+  standardLevel: '',
+  standardLevelName: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  standardOwnerName: '',
+  standardTemperature: null,
+  totalInvestment: null,
+  transmitRange: '',
+  transmitRangeName: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
+})
+const checkTypeOptions = ref<IOptions[]>([])
+const standardOwnerOptions = ref<IOptions[]>([]) // 标准负责人
+const fileList = ref<UploadUserFile[]>([]) // 文件对象数组
+const measureMajorList = ref<IOptions[]>([]) // 计量专业下拉框
+const standardManagerStateList = ref<IOptions[]>([]) // 管理状态下拉框
+const standardLevelList = ref<IOptions[]>([]) // 标准等级下拉框
+const transmitRangeList = ref<IOptions[]>([]) // 传递范围下拉框
+// 标准所在部门下拉框
+const standardUsersDeptList = ref<IOptions[]>([])
+// 获取下拉框
+const getSelectList = (code: string) => {
+  getTypeSelect(code).then((res) => {
+    if (code === 'measureMajor') {
+      measureMajorList.value = res.data
+    }
+    else if (code === 'standardManagerState') {
+      standardManagerStateList.value = res.data
+    }
+    else if (code === 'standardLevel') {
+      standardLevelList.value = res.data
+    }
+    else if (code === 'transmitRange') {
+      transmitRangeList.value = res.data
+    }
+    else if (code === 'standardCategory') {
+      checkTypeOptions.value = res.data
+    }
+  })
+}
+getSelectList('measureMajor') // 获取计量专业下拉框
+getSelectList('standardManagerState') // 获取管理状态下拉框
+getSelectList('standardLevel') // 获取标准等级下拉框
+getSelectList('transmitRange') // 获取传递范围下拉框
+getSelectList('standardCategory') // 获取类别下拉框
+// 获取部门信息参数
+const DeptParams = ref({
+  createEndTime: '',
+  createstartTime: '',
+  director: '',
+  meterMajor: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(DeptParams.value).then((res) => {
+  standardUsersDeptList.value = res.data.rows
+})
+// 获取到标准负责人数组
+const getStandardOwnerOptions = () => {
+  const params = {
+    staffNo: '', // 人员编号
+    name: '', // 姓名
+    deptId: '', // 工作部门
+    major: '', // 计量专业
+    verifierCertificateNo: '', // 证书号
+    certificateStatus: '', // 证书状态
+    limit: 100000,
+    offset: 1,
+  }
+  getStaffList(params).then((res) => {
+    standardOwnerOptions.value = res.data.records
+  })
+}
+getStandardOwnerOptions()
+// 关闭
+const close = () => {
+  emit('close')
+}
+const rules = ref({
+  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  projectNo: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
+  constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
+  organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
+  constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
+  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
+  standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
+  transmitRange: [{ required: true, message: '传递范围不能为空', trigger: 'blur' }],
+  preparationDate: [{ required: true, message: '筹建日期不能为空', trigger: 'blur' }],
+  managerState: [{ required: true, message: '管理状态不能为空', trigger: 'blur' }],
+  measureMajor: [{ required: true, message: '计量专业不能为空', trigger: 'blur' }],
+  assessmentUnit: [{ required: true, message: '考核单位不能为空', trigger: 'blur' }],
+  assessDate: [{ required: true, message: '考核日期不能为空', trigger: 'blur' }],
+  uncertainty: [{ required: true, message: '不确定度不能为空', trigger: 'blur' }],
+  mesureRange: [{ required: true, message: '测量范围不能为空', trigger: 'blur' }],
+  standardTemperature: [{ required: true, message: '标准温度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准温度只能为数字', trigger: 'blur' }],
+  standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
+    { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
+}) // 表单验证规则
+const fileRef = ref() // 文件上传input
+const upload = () => {
+  fileRef.value.click()
+}
+const testForm = ref({
+  fileList: [],
+  fileContent: '',
+})
+const handleFileChange = (files: any, fileList: any) => {
+  testForm.value.fileList = fileList
+  const reader = new FileReader()
+  reader.readAsText(files.raw)
+  // reader.onload = (e) => {
+  //   testForm.value.fileContent = e.target!.result?.replace(
+  //     /\n|\r\n/g,
+  //     '<br/>',
+  //   )
+  // }
+}
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {
+  formInline.value.laboratoryOwnerContact = row.phone
+  formInline.value.laboratoryOwner = row.director
+}
+// 标准实验室清空时
+const clearDeptList = () => {
+  formInline.value.laboratoryOwnerContact = ''
+  formInline.value.laboratoryOwner = ''
+}
+// 获取detail信息
+const getInfo = () => {
+  getStandardListDetail({ id: props.infoId }).then((res) => {
+    Object.keys(res.data).map((item) => {
+      if (typeof (res.data[item]) === 'number') {
+        res.data[item] = res.data[item].toString()
+      }
+    })
+    formInline.value = res.data
+  })
+}
+if (props.buttonType !== 'add') {
+  getInfo()
+}
+watch(() => formInline.value, (newVal) => {
+// 变化后存储
+  emit('setData', newVal)
+},
+{ deep: true, immediate: true })
+// 提交
+const submitForm = () => {
+  return ruleFormRef.value
+}
+defineExpose({ submitForm })
+</script>
+
+<template>
+  <app-container>
+    <div class="info-content">
+      <el-form
+        ref="ruleFormRef"
+        :inline="true"
+        :model="formInline"
+        label-position="left"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="标准代码:">
+              <el-input
+                v-model.trim="formInline.standardNo"
+                placeholder="系统编号，自动生成"
+                disabled
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input
+                v-model.trim="formInline.standardName"
+                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="建标项目:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="组织机构代码:" prop="organizeNo">
+              <el-input
+                v-model.trim="formInline.organizeNo"
+                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="建标单位名称:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准负责人:" prop="standardOwner">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardOwnerOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="contactInfo">
+              <el-input
+                v-model.trim="formInline.contactInfo"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="类 别:" prop="category">
+              <el-select
+                v-model="formInline.category"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in checkTypeOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准等级:" prop="standardLevel">
+              <el-select
+                v-model.trim="formInline.standardLevel"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardLevelList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="传递范围:" prop="transmitRange">
+              <el-select
+                v-model.trim="formInline.transmitRange"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in transmitRangeList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="投资总额:">
+              <el-input
+                v-model.trim="formInline.totalInvestment"
+                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="筹建日期:" prop="preparationDate">
+              <el-date-picker
+                v-model="formInline.preparationDate"
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准科室:">
+              <el-select
+                v-model.trim="formInline.standardLaboratory"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+                @clear="clearDeptList"
+              >
+                <el-option
+                  v-for="item in standardUsersDeptList"
+                  :key="item.id"
+                  :label="item.organizeName"
+                  :value="item.deptId"
+                  @click="changeDeptList(item)"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="科室负责人:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="管理状态:" prop="managerState">
+              <el-select
+                v-model.trim="formInline.managerState"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计量专业:" prop="measureMajor">
+              <el-select
+                v-model.trim="formInline.measureMajor"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                size="default"
+                :disabled="buttonType === 'detail'"
+                style="width: 100%;"
+              >
+                <el-option
+                  v-for="item in measureMajorList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核单位:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :disabled="buttonType === 'detail'"
+                class="full-width-input"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="考核日期:" prop="assessDate">
+              <el-date-picker
+                v-model="formInline.assessDate"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="不确定度:" prop="uncertainty">
+              <el-input
+                v-model.trim="formInline.uncertainty"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="测量范围:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
+                style="width: 500px;"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="2">
+            <el-form-item label="环境条件" />
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准温度:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="标准湿度:" prop="standardHumidity">
+              <el-input
+                v-model.trim="formInline.standardHumidity"
+                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="有效日期:">
+              <el-date-picker
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="buttonType === 'detail' ? '' : '请选择有效日期'"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:">
+              <el-select
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in standardManagerStateList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证单位:">
+              <el-input placeholder="发证单位" disabled class="full-width-input" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="发证日期:">
+              <el-date-picker
+                type="datetime"
+                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                style="width: 100%;"
+                format="YYYY/MM/DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="3">
+            <el-form-item label="附件:">
+              <show-photo :minio-file-name="formInline.minioFileName" />
+              <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="备注:">
+              <el-input
+                v-model.trim="formInline.remark"
+                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :disabled="buttonType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.info-content {
+  padding: 15px;
+  border-radius: 10px;
+  background-color: #fff;
+}
+
+:deep .el-input .el-input--default .el-input--suffix {
+  width: 200px !important;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
new file mode 100644
index 0000000..bd02885
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -0,0 +1,167 @@
+<script lang="ts" setup name="reportOnCredentialsAdd">
+import { ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import type { IOptions } from '../standard_interface'
+import baseInfo from './baseInfo.vue'
+import { getStaffList } from '@/api/measure/person'
+import { getTypeSelect } from '@/api/system/price'
+import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { UploadFile } from '@/api/measure/file'
+const loading = ref(false) // 表单加载状态
+const infoId = ref('') // id
+const pageType = ref('add') // 页面类型: add,edit, detail
+const buttonLoading = ref(false) // 按钮加载状态
+const textMap: { [key: string]: string } = {
+  edit: '编辑',
+  add: '新建',
+  detail: '详情',
+}// 字典
+// 从路由中获取页面类型参数
+const $route = useRoute()
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  if ($route.params.id) {
+    infoId.value = $route.params.id as string
+  }
+}
+// 定义数据
+const formInline = ref({ })
+// 关闭
+interface menuType {
+  name: string
+  comp: any
+}
+const menu = shallowRef<menuType[]>([
+  { name: '基本信息', comp: baseInfo },
+  { name: '原始记录', comp: baseInfo },
+  { name: '征收户报告', comp: baseInfo },
+])
+const baseInfoRef = ref()
+const current = ref('基本信息')
+const currentComp = shallowRef(baseInfo)
+watch(current, (newValue) => {
+  currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
+})
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+const setData = (newValue: object) => {
+  formInline.value = newValue
+}
+
+interface checkedRecord {
+  text: string
+}
+// 编辑获取详情的提交按钮
+const submitFormDetail = () => {
+  if (pageType.value === 'edit') {
+    formInline.value.id = infoId.value
+    getStandardLisUpdate(formInline.value).then((res) => {
+      if (res.code === 200) {
+        close()
+      }
+    })
+  }
+  else {
+    // 打印
+
+  }
+}
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '测量标准装置', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+// 提交
+const submitForm = () => {
+  if (pageType.value === 'detail') { return submitFormDetail() }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    current.value = '基本信息'
+    baseInfoRef.value.submitForm().validate().then(() => {
+      pageType.value === 'add'
+        ? getStandardListAdd(formInline.value).then((res) => {
+          if (res.code === 200) {
+            ElMessage.success('新增成功')
+            close()
+          }
+        })
+        : submitFormDetail()
+    })
+  })
+}
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="submitForm()"
+        >
+          提交
+        </el-button>
+        <el-button
+          v-else
+          v-print="printObj"
+          type="primary"
+        >
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-switch title="">
+      <template #menu>
+        <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>
+      </template>
+    </detail-block-switch>
+    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.top-info {
+  width: 100%;
+  height: 50px;
+  padding-right: 10px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-radius: 10px;
+  background-color: #fff;
+
+  .title {
+    width: 75%;
+    text-align: center;
+  }
+}
+
+.body {
+  background-color: #fff;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
new file mode 100644
index 0000000..5bf6f0f
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -0,0 +1,115 @@
+<script lang="ts" setup name="reportOnCredentialsApproval">
+// 溯源供方审批列表
+import ListApproval from './reportOnCredentialsList.vue' // 全部
+import useDictStore from '@/store/modules/dict'
+import { getQueryPriceInfo } from '@/api/system/price'
+const dictStore = useDictStore()
+interface MenuType {
+  name: string
+  value: any
+}
+interface IButton {
+  name: string
+  type: '' | 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
+  permission?: string
+  proxy?: string
+}
+const menus = ref<MenuType[]>([
+  { name: '全部', value: '0' },
+  { name: '草稿箱', value: '1' },
+  { name: '待审批', value: '2' },
+  { name: '审批中', value: '3' },
+  { name: '已通过', value: '4' },
+  { name: '未通过', value: '5' },
+  { name: '已取消', value: '6' },
+])
+
+const buttonsSet: { [key: string]: IButton[] } = {
+  全部: [{ name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '取消', type: 'info' },
+    { name: '删除', type: 'danger' },
+  ],
+  草稿箱: [
+    { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
+    { name: '提交', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  待审批: [
+    { name: '查看', type: 'primary' },
+    { name: '同意', type: 'primary' },
+    { name: '驳回', type: 'primary' },
+    { name: '拒绝', type: 'danger' },
+    { name: '删除', type: 'danger' },
+  ],
+  审批中: [
+    { name: '查看', type: 'primary' },
+  ],
+  已通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  未通过: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+  已取消: [
+    { name: '查看', type: 'primary' },
+    { name: '删除', type: 'danger' },
+  ],
+
+}
+// 当前tab
+const currentTab = ref('全部')
+// 当前审批状态
+const currentApprovalStatus = ref('0')
+// 当前需要显示的按钮列表
+const currentButtons = ref<IButton[]>([])
+currentButtons.value = buttonsSet['全部']
+// 审批类型字典
+const approvalStatusList = dictStore.getApprovalStatus
+
+const $route = useRoute()
+if ($route.query && $route.query.type) {
+  const currentMenu = menus.value.find(item => item.value == $route.query.type)
+  if (currentMenu) {
+    currentTab.value = currentMenu?.name
+  }
+}
+watch(currentTab, (newValue) => {
+  currentApprovalStatus.value = approvalStatusList[newValue]
+  currentButtons.value = buttonsSet[newValue]
+}, { deep: true, immediate: true })
+</script>
+
+<template>
+  <div class="container">
+    <div class="btns">
+      <!-- 三级菜单-审批状态 -->
+      <el-radio-group v-model="currentTab">
+        <el-radio-button v-for="item of menus" :key="item.name" :label="item.name">
+          {{ item.name }}
+        </el-radio-button>
+      </el-radio-group>
+    </div>
+    <!-- 展示区域 -->
+    <list-approval :status="currentApprovalStatus" :buttons="currentButtons" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.container {
+  position: relative;
+
+  .btns {
+    position: absolute;
+    top: -41px;
+    right: 15px;
+    z-index: 999;
+  }
+}
+</style>
+
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
new file mode 100644
index 0000000..007d8dc
--- /dev/null
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -0,0 +1,373 @@
+<script lang="ts" setup name="ListApproval">
+import type { PropType, Ref } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getSoucreListDelete, getapprovalListPage, sourceSubmit } from '@/api/measure/source'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { submitApproval } from '@/api/approval'
+const props = defineProps({
+  status: {
+    type: String,
+    default: '0',
+  },
+  buttons: {
+    type: Array as PropType<IButton[]>,
+    default: () => [],
+  },
+})
+const emit = defineEmits(['setData']) // 关闭
+
+// 获取权限
+const { proxy } = getCurrentInstance() as any
+// 操作列宽度-计算属性
+const operationWidth = computed(() => {
+  return props.buttons.length * 40 + 24
+})
+
+// 查询条件
+const listQuery: Ref<IlistTypes> = ref({
+  approvalStatus: props.status,
+  businessContent: '',
+  companyArea: '',
+  companyCity: '',
+  companyProvince: '',
+  formId: SCHEDULE.SUPPLIER_APPROVAL,
+  supplierName: '',
+  supplierNo: '',
+  offset: 1,
+  limit: 20,
+})
+// 控制是否显示新增页面
+const show = ref(true)
+// 表格数据
+const list = ref([{ name: '张三', id: '1' }])
+// 总数
+const total = ref(0)
+// 控制审批操作弹窗的开关
+const applyShow = ref(false)
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '证书号', value: 'name', align: 'center' },
+  { text: '证书名称', value: 'name', width: '120', align: 'center' },
+  { text: '样品编号', value: 'name', align: 'center' },
+  { text: '样品名称', value: 'name', align: 'center' },
+  { text: '型号', value: 'name', align: 'center' },
+  { text: '出厂编号', value: 'name', align: 'center' },
+  { text: '委托书编号', value: 'name', width: '120', align: 'center' },
+  { text: '检校类别', value: 'name', align: 'center' },
+  { text: '检定人员', value: 'name', align: 'center' },
+  { text: '审批状态', value: 'name', align: 'center' },
+  { text: '创建时间', value: 'name', align: 'center' },
+])
+// 初始化路由
+const $router = useRouter()
+const buttonArray = ref<string[]>([])
+// 选中的内容
+const checkoutList = ref<string[]>([])
+// 表格loadingTable
+const loadingTable = ref(false)
+// 发送请求
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getapprovalListPage(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch((_) => {
+    // list.value = [
+    //   { approvalStatus: '4', approvalStatusName: '已通过', bankAccount: '453', bankAccountNumber: '354', bankName: '543', briefName: '35431', businessContent: '5434', businessScope: '354', companyAddress: '2313', companyArea: '210103', companyCity: '210100', companyCountry: '中国', companyProvince: '210000', createTime: '2022-12-06 17:21:40', director: '354', fax: '354', id: '1600057880174956546', invoiceAddress: '213123', invoiceArea: '150302', invoiceCity: '150300', invoiceCountry: '中国', invoiceProvince: '150000', mailbox: '354', minioFileName: '', mobile: '354', phone: '354', postalCode: '534', remark: '', supplierName: '北京公司2', supplierNo: 'sygf202212060003', taxNumber: '3543', traceSupplierPersonList: [], website: '354' },
+    // ]
+    loadingTable.value = false
+  })
+}
+// fetchData(true)
+// 多选发生改变时
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+// 点击删除和编辑的参数类型
+interface rowReturn {
+  id: string
+  supplierName: string
+}
+const buttonTypeMap = ref('')
+// 点击删除或者取消
+const handleDelete = (row: rowReturn) => {
+  ElMessageBox.confirm(
+    '确认删除所选记录吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    getSoucreListDelete({ id: row.id }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '删除成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+
+// 取消
+const handleCancel = (row: ISupplier) => {
+  const params = {
+    taskId: row.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm(
+    '确认取消该审批吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      submitApproval('revoke', params).then((res) => {
+        ElMessage({
+          type: 'success',
+          message: '取消成功',
+        })
+        fetchData(true)
+      })
+    })
+}
+
+const approvalDialog = ref()
+
+// 点击搜索
+const searchList = () => {
+  fetchData(false)
+}
+const cancelEvent = () => {
+  console.log('cancel!')
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    approvalStatus: props.status,
+    businessContent: '',
+    companyArea: '',
+    companyCity: '',
+    companyProvince: '',
+    formId: SCHEDULE.SUPPLIER_APPROVAL,
+    supplierName: '',
+    supplierNo: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 导出
+const exportExcelBtn = () => {
+  const params: supplierExportQuery = {
+    approvalStatus: listQuery.value.approvalStatus,
+    businessContent: listQuery.value.businessContent,
+    companyArea: listQuery.value.companyArea,
+    companyCity: listQuery.value.companyCity,
+    companyProvince: listQuery.value.companyProvince,
+    formId: listQuery.value.formId,
+    supplierName: listQuery.value.supplierName,
+    supplierNo: listQuery.value.supplierNo,
+  }
+  if (checkoutList.value.length > 0) {
+    params.ids = checkoutList.value
+  }
+  // TODO: 审批列表导出
+  console.log(params)
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  loading.close()
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  // fetchData(true)
+}
+// 跳转到详情
+const goDetail = (row: ISupplier) => {
+  $router.push(`approve/${props.status}/${row.id}`)
+}
+// 新建溯源供方
+const add = () => {
+  $router.push('/lab/reportOnCredentialsApproval/add')
+}
+// 批量导出
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  // fetchData(true)
+}
+// 审批弹窗关闭
+const handleClose = () => {
+  applyShow.value = false
+}
+// 提交
+const approvalSubmit = (row: ISupplier) => {
+  ElMessageBox.confirm('确认提交吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    sourceSubmit({ id: row.id, formId: SCHEDULE.SUPPLIER_APPROVAL }).then((res) => {
+      if (res.code === 200) {
+        ElMessage({
+          type: 'success',
+          message: '提交成功',
+        })
+        fetchData(true)
+      }
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (row: ISupplier, buttonType: string) => {
+  switch (buttonType) {
+    case '查看':
+      goDetail(row)
+      break
+    case '提交':
+      approvalSubmit(row)
+      break
+    case '编辑':
+      $router.push(`/source/edit/${row.id}`)
+      break
+    case '同意':
+      approvalDialog.value.initDialog('agree', row.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', row.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', row.taskId)
+      break
+    case '取消':
+      handleCancel(row)
+      break
+    case '删除':
+      handleDelete(row)
+      break
+  }
+}
+
+// 监听status变化，更新approvalStatus
+watch (
+  () => props.status,
+  (newVal: string) => {
+    console.log('change status')
+    listQuery.value.approvalStatus = newVal
+    // fetchData(false)
+  },
+  { immediate: true })
+// 打印列表
+function printList() {
+  // 打印列
+  const properties = columns.value.map((item) => {
+    return {
+      field: item.value,
+      displayName: item.text,
+    }
+  })
+  if (checkoutList.value.length <= 0 && list.value.length > 0) {
+    printJSON(list.value, properties, '证书报告列表')
+  }
+  else if (checkoutList.value.length > 0) {
+    const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+    printJSON(printList, properties, '证书报告列表')
+  }
+  else {
+    ElMessage.warning('无可打印内容')
+  }
+}
+
+onActivated(() => {
+  // fetchData(true)
+})
+</script>
+
+<template>
+  <div v-if="show">
+    <app-container>
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierNo" placeholder="证书号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.supplierName" placeholder="委托书编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="委托方名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品编号" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="样品名称" clearable />
+        </search-item>
+        <search-item>
+          <el-input v-model.trim="listQuery.businessContent" placeholder="检校类别" clearable />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button icon="icon-add" title="新建" type="primary" @click="add" />
+          <icon-button icon="icon-export" title="导出" type="primary" @click="exportAll" />
+          <icon-button icon="icon-print" title="打印" type="primary" @click="printList" />
+        </template>
+        <normal-table
+          :data="list" :total="total" :columns="columns" :query="listQuery"
+          :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" :width="operationWidth">
+              <template #default="{ row }">
+                <el-button
+                  v-for="(item, index) in buttons"
+                  :key="index"
+                  size="small"
+                  :type="item.type" link
+                  @click="clickBtn(row, item.name)"
+                >
+                  {{ item.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+</template>
+
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index 0046fa3..a9f3bf7 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -35,49 +35,32 @@
 const columns = ref([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index a8e1295..1666540 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -402,7 +402,6 @@
     res.data.equipmentInfoList.map((item: objectReturn) => {
       if (item.id) {
         item.equipmentId = item.id
-        item.id = ''
       }
       // 如果选择的没有id则就让装置数组置空
       else {
@@ -443,7 +442,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -530,7 +528,6 @@
               <el-input
                 v-model.trim="formInline.remark"
                 placeholder="备注"
-                style="width: 500px;"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 4ff3806..0fda7a8 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -59,49 +59,32 @@
 const columns = ref<TableColumn[]>([
   {
     text: '检修申请编号',
-    value: 'checkApplyNo',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '检修申请名称',
-    value: 'checkApplyName',
-    width: '120',
-    align: 'center',
-  },
-  {
-    text: '设备编号',
     value: 'applyNo',
     align: 'center',
   },
   {
-    text: '设备名称',
+    text: '检修申请名称',
     value: 'applyName',
     align: 'center',
   },
   {
-    text: '出厂编号',
-    value: 'overhaulPerson',
+    text: '申请单位',
+    value: 'applyUnitName',
     align: 'center',
   },
   {
-    text: '设备型号',
-    value: 'createTime',
+    text: '申请人',
+    value: 'applyPersonName',
     align: 'center',
   },
   {
-    text: '送修单位',
-    value: 'createTime',
+    text: '检修时间',
+    value: 'time',
     align: 'center',
   },
   {
-    text: '送修人',
-    value: 'createTime',
-    align: 'center',
-  },
-  {
-    text: '申请日期',
-    value: 'createTime',
+    text: '备注',
+    value: 'remark',
     align: 'center',
   },
   {
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 0a3dd34..4e2432f 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -450,7 +450,6 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
         label-position="right"
         label-width="110px"
@@ -523,7 +522,6 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
                 placeholder="备注"
                 :disabled="pageType === 'detail'"
               />
diff --git a/src/views/device/standardEquipment/cancelApply.vue b/src/views/device/standardEquipment/cancelApply.vue
index 10ae252..936151c 100644
--- a/src/views/device/standardEquipment/cancelApply.vue
+++ b/src/views/device/standardEquipment/cancelApply.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="cancelApply">
-import applyList from './components/applyList.vue'
+import ApplyList from './components/applyList.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 // 逻辑代码
 </script>
diff --git a/src/views/device/standardEquipment/components/applyList.vue b/src/views/device/standardEquipment/components/applyList.vue
index f5510c1..37839c3 100644
--- a/src/views/device/standardEquipment/components/applyList.vue
+++ b/src/views/device/standardEquipment/components/applyList.vue
@@ -16,8 +16,7 @@
     default: '',
   },
 })
-console.log(props.schedule, '11111')
-export interface menuType {
+interface menuType {
   name: string
   comp: any
 }
@@ -36,7 +35,7 @@
   currentComp.value = menu.value.filter(item => item.name === newValue)[0].comp
 })
 const disabled = ref(false)
-const setData = (newIsShow) => {
+const setData = (newIsShow: boolean) => {
   if (newIsShow === false) {
     disabled.value = true
   }
diff --git a/src/views/device/standardEquipment/components/listApply/all.vue b/src/views/device/standardEquipment/components/listApply/all.vue
index aec5c4e..e5eef0f 100644
--- a/src/views/device/standardEquipment/components/listApply/all.vue
+++ b/src/views/device/standardEquipment/components/listApply/all.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="all">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="全部" :buttoms="buttoms" approval-status="" />
+  <list-page name="全部" :buttons="buttons" approval-status="" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/approvalPending.vue b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
index 5300c19..2b12e75 100644
--- a/src/views/device/standardEquipment/components/listApply/approvalPending.vue
+++ b/src/views/device/standardEquipment/components/listApply/approvalPending.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="approvalPending">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -12,5 +12,5 @@
 </script>
 
 <template>
-  <list-page name="待审批" :buttoms="buttoms" approval-status="2" />
+  <list-page name="待审批" :buttons="buttons" approval-status="2" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/canceled.vue b/src/views/device/standardEquipment/components/listApply/canceled.vue
index a7ffa3f..0ccc701 100644
--- a/src/views/device/standardEquipment/components/listApply/canceled.vue
+++ b/src/views/device/standardEquipment/components/listApply/canceled.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="canceled">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="已取消" :buttoms="buttoms" approval-status="6" />
+  <list-page name="已取消" :buttons="buttons" approval-status="6" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/draftBox.vue b/src/views/device/standardEquipment/components/listApply/draftBox.vue
index 8c1ee5d..0bb8988 100644
--- a/src/views/device/standardEquipment/components/listApply/draftBox.vue
+++ b/src/views/device/standardEquipment/components/listApply/draftBox.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="draftBox">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '编辑', type: 'primary' },
   { name: '提交', type: 'primary' },
@@ -11,5 +11,5 @@
 </script>
 
 <template>
-  <list-page name="草稿箱" :buttoms="buttoms" approval-status="1" />
+  <list-page name="草稿箱" :buttons="buttons" approval-status="1" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
index f86c881..2e80544 100644
--- a/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
+++ b/src/views/device/standardEquipment/components/listApply/examineAndApprove.vue
@@ -2,7 +2,7 @@
 <script lang="ts" setup name="examineAndApprove">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([
+const buttons = ref([
   { name: '查看', type: 'primary' },
   { name: '同意', type: 'primary' },
   { name: '驳回', type: 'primary' },
@@ -13,5 +13,5 @@
 </script>
 
 <template>
-  <list-page name="审批中" :buttoms="buttoms" approval-status="3" />
+  <list-page name="审批中" :buttons="buttons" approval-status="3" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index b28f5d6..cf3712f 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -2,26 +2,27 @@
 import { reactive, ref } from 'vue'
 import type { PropType, Ref } from 'vue'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import type { IOptions, Ibuttoms, IlistQuery, IlistTypes } from '../../standard_interface'
+import type { IOptions, Ibuttons, IlistQuery, IlistTypes } from '../../standard_interface'
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
-import { exportExcel } from '@/utils/exportXlsx'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 import { submitApproval } from '@/api/approval'
 const props = defineProps({
   name: {
     type: String,
     default: '',
   },
+  // 表单id
   schedule: {
     type: String,
     default: '',
   },
-  buttoms: {
-    type: Array as PropType<Ibuttoms[]>,
+  buttons: {
+    type: Array as PropType<Ibuttons[]>,
     default: () => [],
   },
   applyType: {
@@ -331,22 +332,10 @@
     text: 'Loading',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0) {
-    exportExcel({
-      json: list.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
-  else {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistTypes, index: number) => ({ index: index + 1, applyNo: item.applyNo, applyTypeName: item.applyTypeName, standardNo: item.standardNo, standardName: item.standardName, constructionStandardUnitName: item.constructionStandardUnitName, standardOwner: item.standardOwner, applyDept: item.applyDept, createUser: item.createUser, createTime: item.createTime, approvalStatusName: item.approvalStatusName })),
-      name: '标准装置申请',
-      titleArr: ['序号', '申请编号', '申请类型', '标准代码', '标准名称', '标准所在部门', '负责人', '申请部门', '申请人', '申请时间', '审批状态'],
-      sheetName: 'sheet1',
-    })
-  }
+  getExportList(listQuery.value).then((res) => {
+    const blob = new Blob([res.data])
+    exportFile(blob, '标准装置申请列表.xlsx')
+  })
   loading.close()
 }
 // 审批结束回调
@@ -516,7 +505,7 @@
             <el-table-column label="操作" align="center" width="300">
               <template #default="{ row }">
                 <el-button
-                  v-for="(item, index) in buttoms"
+                  v-for="(item, index) in buttons"
                   :key="index"
                   size="small"
                   :type="item.type" link
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index fca74d7..9832687 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,8 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
-import { conditionalExpression } from '@babel/types'
-import UserListDialog from '../../../stateManage/components/addRow.vue'
+import StandarDialog from './standardDialog.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
@@ -594,7 +593,7 @@
     clickBtn(item)
   }
 }
-
+// 审批流程模拟数据
 const approvalActivities = [
   {
     name: '张三',
@@ -617,10 +616,13 @@
 const approvalSuccess = () => {
 
 }
+// 选择标准装置弹窗ref
+const standarDialog = ref()
 // 选择了标准名称后
 const standardChange = (e: any) => {
-  getInfo(e)
-  formInline.value.standardOwner = e
+  // getInfo(e)
+  // formInline.value.standardOwner = e
+  standarDialog.value.initDialog()
 }
 // 点击增加行
 const addRoow = () => {
@@ -682,6 +684,8 @@
   }
   applyListClose()
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: object) => {}
 </script>
 
 <template>
@@ -702,14 +706,24 @@
       </template>
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="标准名称:" prop="standardName">
+              <el-input v-model="fromListInfo.standardName" :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'" class="input" :disabled="pageType === 'detail'">
+                <template #append>
+                  <el-button size="small" :disabled="pageType === 'detail'" @click="standardChange">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
@@ -720,30 +734,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准名称:" prop="standardName">
-              <el-select
-                v-model.trim="fromListInfo.standardEquipmentId"
-                clearable
-                placeholder="标准名称"
-                style="width: 100%;"
-                size="default"
-                :disabled="pageType === 'detail'"
-                @change="standardChange"
-              >
-                <el-option
-                  v-for="item in standardList"
-                  :key="item.id"
-                  :label="item.standardName"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                placeholder="项目编号"
+                :placeholder="pageType === 'detail' ? '' : '项目编号'"
                 class="full-width-input"
                 disabled
               />
@@ -753,7 +747,7 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                placeholder="建标项目"
+                :placeholder="pageType === 'detail' ? '' : '建标项目'"
                 class="full-width-input"
                 disabled
               />
@@ -765,7 +759,7 @@
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                placeholder="组织机构代码"
+                :placeholder="pageType === 'detail' ? '' : '组织机构代码'"
                 class="full-width-input"
                 disabled
               />
@@ -778,7 +772,7 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                placeholder="建标单位名称"
+                :placeholder="pageType === 'detail' ? '' : '建标单位名称'"
                 class="full-width-input"
                 disabled
               />
@@ -789,7 +783,7 @@
               <el-select
                 v-model="formInline.standardOwner"
                 clearable
-                placeholder="标准负责人"
+                :placeholder="pageType === 'detail' ? '' : '标准负责人'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -807,7 +801,7 @@
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -820,7 +814,7 @@
               <el-select
                 v-model="formInline.category"
                 clearable
-                placeholder="类别"
+                :placeholder="pageType === 'detail' ? '' : '类别'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -839,7 +833,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                placeholder="标准等级"
+                :placeholder="pageType === 'detail' ? '' : '标准等级'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -858,7 +852,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                placeholder="传递范围"
+                :placeholder="pageType === 'detail' ? '' : '传递范围'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -876,7 +870,7 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                placeholder="投资总额"
+                :placeholder="pageType === 'detail' ? '' : '投资总额'"
                 class="full-width-input"
                 disabled
               />
@@ -888,11 +882,11 @@
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
-                placeholder="请选择筹建日期"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -902,7 +896,7 @@
               <el-select
                 v-model="formInline.standardLaboratory"
                 clearable
-                placeholder="标准所在实验室"
+                :placeholder="pageType === 'detail' ? '' : '标准所在实验室'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -913,7 +907,6 @@
                   :key="item.id"
                   :label="item.organizeName"
                   :value="item.deptId"
-                  @click="changeDeptList(item)"
                 />
               </el-select>
             </el-form-item>
@@ -922,7 +915,7 @@
             <el-form-item label="实验室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                placeholder="实验室负责人"
+                :placeholder="pageType === 'detail' ? '' : '实验室负责人'"
                 class="full-width-input"
                 disabled
               />
@@ -932,7 +925,7 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                placeholder="联系方式"
+                :placeholder="pageType === 'detail' ? '' : '联系方式'"
                 class="full-width-input"
                 disabled
               />
@@ -945,7 +938,7 @@
               <el-select
                 v-model="formInline.managerState"
                 clearable
-                placeholder="管理状态"
+                :placeholder="pageType === 'detail' ? '' : '管理状态'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -964,7 +957,7 @@
               <el-select
                 v-model="formInline.measureMajor"
                 clearable
-                placeholder="计量专业"
+                :placeholder="pageType === 'detail' ? '' : '计量专业'"
                 style="width: 100%;"
                 size="default"
                 disabled
@@ -982,7 +975,7 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                placeholder="考核单位"
+                :placeholder="pageType === 'detail' ? '' : '考核单位'"
                 class="full-width-input"
                 disabled
               />
@@ -994,9 +987,9 @@
                 v-model="formInline.assessDate"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择考核日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '考核日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1007,8 +1000,8 @@
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                placeholder="不确定度"
+                :placeholder="pageType === 'detail' ? '' : '不确定度'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1019,8 +1012,8 @@
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                placeholder="测量范围"
-                style="width: 500px;"
+                :placeholder="pageType === 'detail' ? '' : '测量范围'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1034,7 +1027,7 @@
             <el-form-item label="标准温度:" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                placeholder="标准温度℃"
+                :placeholder="pageType === 'detail' ? '' : '标准温度℃'"
                 class="full-width-input"
                 disabled
               />
@@ -1044,7 +1037,7 @@
             <el-form-item label="标准湿度:" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                placeholder="标准湿度%"
+                :placeholder="pageType === 'detail' ? '' : '标准湿度%'"
                 class="full-width-input"
                 disabled
               />
@@ -1057,9 +1050,9 @@
               <el-date-picker
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择有效日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                :placeholder="pageType === 'detail' ? '' : '有效日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1068,7 +1061,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                placeholder="证书编号"
+                :placeholder="pageType === 'detail' ? '' : '证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -1090,10 +1083,10 @@
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                placeholder="请选择发证日期"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '发证日期'"
+                format="YYYY/MM/DD"
+                value-format="YYYY-MM-DD"
                 style="width: 100%;"
                 disabled
               />
@@ -1105,8 +1098,8 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '备注'"
+                class="full-width-input"
                 disabled
               />
             </el-form-item>
@@ -1137,7 +1130,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columns"
@@ -1149,7 +1142,7 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
+          <template v-if="item.text === '设备名称'" #default="scope">
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1157,8 +1150,8 @@
             >
               <template v-if="item.choose" #append>
                 <el-button
+                  v-if="pageType !== 'detail'"
                   size="small"
-                  :disabled="pageType === 'detail'"
                   @click="chooseList(scope.row, scope.$index)"
                 >
                   选择
@@ -1188,7 +1181,7 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="38" />
+        <el-table-column v-if="pageType !== 'detail'" type="selection" width="38" />
         <el-table-column align="center" label="序号" width="80" type="index" />
         <el-table-column
           v-for="item in columnsFiles"
@@ -1204,10 +1197,10 @@
             <el-date-picker
               v-if="item.time"
               v-model="scope.row[item.value]"
-              type="datetime"
+              type="date"
               placeholder="请选择发证日期"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
             />
             <el-input
               v-else
@@ -1255,8 +1248,10 @@
       </detail-block>
     </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <user-list-dialog ref="userListDialog" @add="confirmPerson" />
+  <!-- 选择标准装置弹窗 -->
+  <standar-dialog ref="standarDialog" @add="StandarAddRow" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/views/device/standardEquipment/components/listApply/passed.vue b/src/views/device/standardEquipment/components/listApply/passed.vue
index 1e31fc6..4138656 100644
--- a/src/views/device/standardEquipment/components/listApply/passed.vue
+++ b/src/views/device/standardEquipment/components/listApply/passed.vue
@@ -2,9 +2,9 @@
 <script lang="ts" setup name="passed">
 import { ref } from 'vue'
 import listPage from './listPage.vue'
-const buttoms = ref([{ name: '查看', type: 'primary' }])
+const buttons = ref([{ name: '查看', type: 'primary' }])
 </script>
 
 <template>
-  <list-page name="已通过" :buttoms="buttoms" approval-status="4" />
+  <list-page name="已通过" :buttons="buttons" approval-status="4" />
 </template>
diff --git a/src/views/device/standardEquipment/components/listApply/standardDialog.vue b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
new file mode 100644
index 0000000..bbf753f
--- /dev/null
+++ b/src/views/device/standardEquipment/components/listApply/standardDialog.vue
@@ -0,0 +1,187 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getStandardList } from '@/api/device/standard'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  category: '', // 类别
+  id: '',
+  managerState: '', // 管理状态
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
+})
+const loadingTable = ref<boolean>(false)
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+}
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<columnsType[]>([
+  {
+    text: '标准代码',
+    value: 'standardNo',
+    align: 'center',
+  },
+  {
+    text: '标准名称',
+    value: 'standardName',
+    align: 'center',
+  },
+  {
+    text: '类别',
+    value: 'categoryName',
+    align: 'center',
+  },
+  {
+    text: '标准等级',
+    value: 'standardLevelName',
+    align: 'center',
+  },
+  {
+    text: '传递范围',
+    value: 'transmitRangeName',
+    align: 'center',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+    align: 'center',
+  }])
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStandardList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    category: '', // 类别
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择装置" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardName"
+          placeholder="标准名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.standardNo"
+          placeholder="标准代码"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/listApply/userListDialog.vue b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
index 9a9c992..7e02e2f 100644
--- a/src/views/device/standardEquipment/components/listApply/userListDialog.vue
+++ b/src/views/device/standardEquipment/components/listApply/userListDialog.vue
@@ -1,129 +1,145 @@
 <!-- 用户列表弹窗 -->
 <script lang="ts" setup name="selectPerson">
 import { ElMessage } from 'element-plus'
-import { getUserList } from '@/api/system/user'
+import { getStaffList } from '@/api/measure/person'
 import { getDeptTreeList } from '@/api/system/dept'
-import type { TreeStructure } from '@/views/system/user/user-interface'
-import type { TableColumn } from '@/components/NormalTable/table_interface'
-const props = defineProps({
-  list: {
-    type: Array,
-    default: () => [],
-  },
-})
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
 const emits = defineEmits(['add'])
 const dialogFormVisible = ref(false)
-
 // 查询条件
 const listQuery = ref({
-  name: '', // 姓名
+  certificateStatus: '', // 姓名
+  major: '',
+  name: '',
+  staffNo: '',
+  verifierCertificateNo: '',
+  deptId: '', // 所在部门
+  limit: 20,
+  offset: 1,
 })
 const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
 const total = ref<number>(0)
 const select = ref<number>(-1)
-const columns = ref<TableColumn[]>([
+const columns = ref([
   {
-    text: '设备名称',
+    text: '姓名',
     value: 'name',
-    align: 'center',
   },
   {
-    text: '设备编号',
-    value: 'bianhao',
-    align: 'center',
+    text: '人员编号',
+    value: 'staffNo',
   },
   {
-    text: '型号',
-    value: 'xinghao',
-    align: 'center',
+    text: '所在部门',
+    value: 'deptId',
   },
   {
-    text: '测量范围',
-    value: 'fanwei',
-    align: 'center',
-  },
-  {
-    text: '使用部门',
-    value: 'bumen',
-    align: 'center',
-  },
-  {
-    text: '检定时间',
-    value: 'time',
-    align: 'center',
-  },
-  {
-    text: '检定结果',
-    value: 'jieguo',
-    align: 'center',
-  },
-  {
-    text: '有效日期',
-    value: 'riqi',
-    align: 'center',
+    text: '行政职务',
+    value: 'administrationJob',
   },
 ])
-const list = ref<object[]>([])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getStaffList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.records
+      total.value = res.data.total
+    }
+  })
+}
 // 搜索
 const search = () => {
-  list.value = props.list.filter(item => item.name === listQuery.value.name)
+  fetchData()
 }
-const changePage = (e: any) => {
-  console.log(e)
-}
+const selectTreeRef = ref()
 // 重置
 const reset = () => {
   listQuery.value = {
-    name: '', // 姓名
+    certificateStatus: '', // 姓名
+    major: '',
+    name: '',
+    staffNo: '',
+    verifierCertificateNo: '',
+    deptId: '', // 所在部门
+    limit: 20,
+    offset: 1,
   }
-  list.value = props.list
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
 }
 // 点击保存
 const submitForm = () => {
-  console.log(select.value)
   if (select.value >= 0) {
     const person = list.value.filter((item, index) => index == select.value)[0]
     emits('add', person)
     dialogFormVisible.value = false
+    reset()
   }
   else {
     ElMessage.warning('请先选择人员')
   }
 }
-// 监听数据变化
-watch(
-  [() => props.list], ([newNums], [oldNums]) => {
-    list.value = newNums
-  },
-  {
-    immediate: true,
-    deep: true,
-  },
-)
 // 取消
 const resetForm = () => {
   dialogFormVisible.value = false
+  reset()
 }
 // 初始化
 const initDialog = () => {
+  // reset()
   dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
 }
 defineExpose({ initDialog })
 </script>
 
 <template>
-  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+  <el-dialog v-model="dialogFormVisible" title="选择人员" width="50%">
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model.trim="listQuery.name" placeholder="设备名称" clearable />
+        <el-input v-model.trim="listQuery.name" placeholder="真实姓名" clearable />
+      </search-item>
+      <search-item>
+        <!-- <el-select v-model="listQuery.deptId" placeholder="所在部门" clearable>
+          <el-option v-for="item in deptIdList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select> -->
+        <com-tree-select
+          ref="selectTreeRef" v-model="listQuery.deptId" :options="deptIdList"
+          placeholder="所在部门" :tree-props="deptProps"
+        />
       </search-item>
     </search-area>
     <!-- 查询结果Table显示 -->
     <div style="padding: 12px;">
       <normal-table
         :data="list" :total="total" :columns="columns" :query="listQuery"
-        :list-loading="loadingTable" :pagination="false"
+        :list-loading="loadingTable" @change="changePage"
       >
         <template #preColumns>
           <el-table-column label="选择" width="55" align="center">
@@ -131,6 +147,11 @@
               <el-radio v-model="select" :label="scope.$index" class="radio" />
             </template>
           </el-table-column>
+        <!-- <el-table-column label="#" width="55" align="center">
+          <template #default="scope">
+            {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+          </template>
+        </el-table-column> -->
         </template>
       </normal-table>
     </div>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 0b15289..07b439b 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -3,10 +3,12 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
 import type { IOptions } from '../../standard_interface'
+import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
 import { getStandardListDetail, getUsersDept } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import personListDialog from '@/views/measure/person/components/personListDialog.vue'
 const props = defineProps({
   infoId: {
     type: String,
@@ -140,7 +142,7 @@
   constructionStandardProject: [{ required: true, message: '建标项目不能为空', trigger: 'blur' }],
   organizeNo: [{ required: true, message: '组织机构代码不能为空', trigger: 'blur' }],
   constructionStandardUnitName: [{ required: true, message: '建标单位名称不能为空', trigger: 'blur' }],
-  standardOwner: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
+  standardOwnerName: [{ required: true, message: '标准负责人不能为空', trigger: 'blur' }],
   contactInfo: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
   category: [{ required: true, message: '类 别不能为空', trigger: 'blur' }],
   standardLevel: [{ required: true, message: '标准等级不能为空', trigger: 'blur' }],
@@ -157,34 +159,20 @@
   standardHumidity: [{ required: true, message: '标准湿度不能为空', trigger: 'blur' },
     { pattern: /(^-?\d\d*\.\d*$)|(^-?\d\d*$)|(^-?\.\d\d*$)/, message: '标准湿度只能为数字', trigger: 'blur' }],
 }) // 表单验证规则
-const fileRef = ref() // 文件上传input
-const upload = () => {
-  fileRef.value.click()
-}
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 标准实验室发生改变row类型
 interface rowReturn {
   phone: string
   director: string
+  name: string
+  organizeName: string
+  id: string
 }
-// 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
+// 实验室ref
+const laboratorydialog = ref()
+// 标准实验室点击
+const changeDeptList = () => {
+  laboratorydialog.value.initDialog()
 }
 // 标准实验室清空时
 const clearDeptList = () => {
@@ -205,6 +193,24 @@
 if (props.buttonType !== 'add') {
   getInfo()
 }
+// 计量人员组件
+const personListdialog = ref()
+// 点击选择负责人函数
+const personClick = () => {
+  personListdialog.value.initDialog()
+}
+// 选择负责人回调函数
+const personListAdd = (data: rowReturn) => {
+  formInline.value.standardOwner = data.id
+  formInline.value.standardOwnerName = data.name
+}
+// 选择完科室的回调函数
+const laboratoryListAdd = (data: rowReturn) => {
+  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratoryName = data.organizeName
+  formInline.value.laboratoryOwner = data.director
+  formInline.value.laboratoryOwnerContact = data.phone
+}
 watch(() => formInline.value, (newVal) => {
 // 变化后存储
   emit('setData', newVal)
@@ -222,18 +228,17 @@
     <div class="info-content">
       <el-form
         ref="ruleFormRef"
-        :inline="true"
         :model="formInline"
-        label-position="left"
+        label-position="right"
         label-width="auto"
         :rules="rules"
       >
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="标准代码:">
               <el-input
                 v-model.trim="formInline.standardNo"
-                placeholder="系统编号，自动生成"
+                :placeholder="buttonType === 'detail' ? '' : '系统编号，自动生成'"
                 disabled
                 class="full-width-input"
               />
@@ -243,9 +248,10 @@
             <el-form-item label="标准名称:" prop="standardName">
               <el-input
                 v-model.trim="formInline.standardName"
-                :placeholder="buttonType === 'detail' ? '' : '标准名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -253,9 +259,10 @@
             <el-form-item label="项目编号:" prop="projectNo">
               <el-input
                 v-model.trim="formInline.projectNo"
-                :placeholder="buttonType === 'detail' ? '' : '项目编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入项目编号'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -263,21 +270,23 @@
             <el-form-item label="建标项目:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="formInline.constructionStandardProject"
-                :placeholder="buttonType === 'detail' ? '' : '建标项目'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标项目'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="组织机构代码:" prop="organizeNo">
               <el-input
                 v-model.trim="formInline.organizeNo"
-                :placeholder="buttonType === 'detail' ? '' : '组织机构代码'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入组织机构代码'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -288,49 +297,52 @@
             >
               <el-input
                 v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入建标单位名称'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准负责人:" prop="standardOwner">
-              <el-select
-                v-model="formInline.standardOwner"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准负责人'"
-                size="default"
+            <el-form-item label="标准负责人:" prop="standardOwnerName">
+              <el-input
+                v-model.trim="formInline.standardOwnerName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准负责人'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="personClick"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="联系方式:" prop="contactInfo">
               <el-input
                 v-model.trim="formInline.contactInfo"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="类 别:" prop="category">
               <el-select
                 v-model="formInline.category"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '类别'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择类别'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -340,6 +352,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -349,7 +362,7 @@
               <el-select
                 v-model.trim="formInline.standardLevel"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准等级'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准等级'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -359,6 +372,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -368,7 +382,7 @@
               <el-select
                 v-model.trim="formInline.transmitRange"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '传递范围'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择传递范围'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -377,6 +391,7 @@
                   v-for="item in transmitRangeList"
                   :key="item.id"
                   :label="item.name"
+                  clearable
                   :value="item.value"
                 />
               </el-select>
@@ -386,55 +401,57 @@
             <el-form-item label="投资总额:">
               <el-input
                 v-model.trim="formInline.totalInvestment"
-                :placeholder="buttonType === 'detail' ? '' : '投资总额'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入投资总额'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="筹建日期:" prop="preparationDate">
               <el-date-picker
                 v-model="formInline.preparationDate"
-                type="datetime"
+                type="date"
                 :placeholder="buttonType === 'detail' ? '' : '请选择筹建日期'"
                 style="width: 100%;"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="标准科室:">
-              <el-select
-                v-model.trim="formInline.standardLaboratory"
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '标准科室'"
-                size="default"
+              <el-input
+                v-model.trim="formInline.standardLaboratoryName"
+                :placeholder="buttonType === 'detail' ? '' : '请选择标准科室'"
                 :disabled="buttonType === 'detail'"
-                style="width: 100%;"
-                @clear="clearDeptList"
+                class="full-width-input"
+                clearable
               >
-                <el-option
-                  v-for="item in standardUsersDeptList"
-                  :key="item.id"
-                  :label="item.organizeName"
-                  :value="item.deptId"
-                  @click="changeDeptList(item)"
-                />
-              </el-select>
+                <template v-if="buttonType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    @click="changeDeptList"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="科室负责人:">
               <el-input
                 v-model.trim="formInline.laboratoryOwner"
-                :placeholder="buttonType === 'detail' ? '' : '科室负责人'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入科室负责人'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -442,20 +459,21 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.laboratoryOwnerContact"
-                :placeholder="buttonType === 'detail' ? '' : '联系方式'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入联系方式'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="管理状态:" prop="managerState">
               <el-select
                 v-model.trim="formInline.managerState"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '管理状态'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择管理状态'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -465,6 +483,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -474,7 +493,7 @@
               <el-select
                 v-model.trim="formInline.measureMajor"
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '计量专业'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择计量专业'"
                 size="default"
                 :disabled="buttonType === 'detail'"
                 style="width: 100%;"
@@ -484,6 +503,7 @@
                   :key="item.id"
                   :label="item.name"
                   :value="item.value"
+                  clearable
                 />
               </el-select>
             </el-form-item>
@@ -492,9 +512,10 @@
             <el-form-item label="考核单位:" prop="assessmentUnit">
               <el-input
                 v-model.trim="formInline.assessmentUnit"
-                :placeholder="buttonType === 'detail' ? '' : '考核单位'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入考核单位'"
                 :disabled="buttonType === 'detail'"
                 class="full-width-input"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -502,64 +523,67 @@
             <el-form-item label="考核日期:" prop="assessDate">
               <el-date-picker
                 v-model="formInline.assessDate"
-                type="datetime"
+                type="date"
                 style="width: 100%;"
                 :placeholder="buttonType === 'detail' ? '' : '请选择考核日期'"
-                format="YYYY/MM/DD HH:mm:ss"
-                value-format="YYYY-MM-DD h:m:s"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="不确定度:" prop="uncertainty">
               <el-input
                 v-model.trim="formInline.uncertainty"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '不确定度'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入不确定度'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="测量范围:" prop="mesureRange">
               <el-input
                 v-model.trim="formInline.mesureRange"
-                :placeholder="buttonType === 'detail' ? '' : '测量范围'"
-                style="width: 500px;"
+                :placeholder="buttonType === 'detail' ? '' : '请输入测量范围'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="2">
             <el-form-item label="环境条件" />
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准温度:" prop="standardTemperature">
+            <el-form-item label="标准温度(℃):" prop="standardTemperature">
               <el-input
                 v-model.trim="formInline.standardTemperature"
-                :placeholder="buttonType === 'detail' ? '' : '标准温度℃'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准温度(℃)'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="标准湿度:" prop="standardHumidity">
+            <el-form-item label="标准湿度(%):" prop="standardHumidity">
               <el-input
                 v-model.trim="formInline.standardHumidity"
-                :placeholder="buttonType === 'detail' ? '' : '标准湿度%'"
+                clearable
+                :placeholder="buttonType === 'detail' ? '' : '请输入标准湿度(%)'"
                 :disabled="buttonType === 'detail'"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
@@ -576,7 +600,7 @@
             <el-form-item label="证书编号:">
               <el-select
                 clearable
-                :placeholder="buttonType === 'detail' ? '' : '证书编号'"
+                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
                 size="default"
                 style="width: 100%;"
                 disabled
@@ -592,7 +616,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input :placeholder="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -608,25 +632,25 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row :gutter="20">
+        <!-- <el-row :gutter="24">
           <el-col :span="3">
             <el-form-item label="附件:">
               <show-photo :minio-file-name="formInline.minioFileName" />
               <input v-show="buttonType === ''" ref="fileRef" type="file" @change="onFileChange">
-              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+              <el-button type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '24px' }" @click="upload">
                 {{ formInline.minioFileName === '' ? '上传' : '更换附件' }}
                 </el-button>
             </el-form-item>
           </el-col>
         </el-row> -->
-        <el-row :gutter="20">
+        <el-row :gutter="24" class="marg">
           <el-col :span="12">
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                style="width: 500px;"
-                :placeholder="buttonType === 'detail' ? '' : '备注'"
+                :placeholder="buttonType === 'detail' ? '' : '请输入备注'"
                 :disabled="buttonType === 'detail'"
+                clearable
               />
             </el-form-item>
           </el-col>
@@ -634,6 +658,8 @@
       </el-form>
     </div>
   </app-container>
+  <person-list-dialog ref="personListdialog" @add="personListAdd" />
+  <laboratory-dialog ref="laboratorydialog" @add="laboratoryListAdd" />
 </template>
 
 <style lang="scss" scoped>
@@ -659,8 +685,4 @@
   border-radius: 10px;
   background-color: #fff;
 }
-
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
-}
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
new file mode 100644
index 0000000..6024925
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/equipmentDialog.vue
@@ -0,0 +1,148 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/device/standingBook'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  equipmentName: '', // 设备名称
+  equipmentNo: '', // 设备编号
+  offset: 1,
+  limit: 20,
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    equipmentName: '', // 设备名称
+    equipmentNo: '', // 设备编号
+    offset: 1,
+    limit: 20,
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择设备" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentName"
+          placeholder="设备名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.equipmentNo"
+          placeholder="设备编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
new file mode 100644
index 0000000..c19de5d
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/laboratoryDialog.vue
@@ -0,0 +1,165 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { getUsersDept } from '@/api/device/standard'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  director: '',
+  ids: [],
+  limit: 20,
+  meterMajor: '',
+  offset: 1,
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '3',
+  pDeptId: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref([
+  {
+    text: '科室编号',
+    value: 'organizeNo',
+  },
+  {
+    text: '科室名称',
+    value: 'organizeName',
+  },
+  {
+    text: '负责人',
+    value: 'director',
+  },
+  {
+    text: '行政职务',
+    value: 'administrationJobName',
+  },
+])
+const deptProps = reactive({
+  parent: 'pid', value: 'id', label: 'name', children: 'children',
+})
+// 获取部门
+const deptIdList = ref([])
+const getDeptList = () => {
+  getDeptTreeList().then((res) => {
+    deptIdList.value = toTreeList(res.data, '0', true)
+  })
+}
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  getUsersDept(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    director: '',
+    ids: [],
+    limit: 20,
+    meterMajor: '',
+    createStartTime: '',
+    createEndTime: '',
+    offset: 1,
+    organizeName: '',
+    organizeNo: '',
+    organizeType: '3',
+    pDeptId: '',
+  }
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择科室')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  getDeptList()
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择科室" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeNo" placeholder="科室编号" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model.trim="listQuery.organizeName" placeholder="科室名称" clearable />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardList/templateTable.vue b/src/views/device/standardEquipment/components/standardList/templateTable.vue
index bb89e24..e0409c5 100644
--- a/src/views/device/standardEquipment/components/standardList/templateTable.vue
+++ b/src/views/device/standardEquipment/components/standardList/templateTable.vue
@@ -29,7 +29,7 @@
     default: '',
   },
 })
-const emits = defineEmits(['changePage', 'addRow', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
+const emits = defineEmits(['changePage', 'deleteRow', 'handleSelectionChange', 'selectPerson'])
 const searchQuery = ref({
   limit: 10,
   offset: 1,
@@ -45,14 +45,6 @@
   }
   emits('changePage', searchQuery)
 }
-// 点击增加行
-const addRow = () => {
-  emits('addRow')
-}
-// 点击删除行
-const deleteRow = () => {
-  emits('deleteRow', props.title)
-}
 // 多选发生改变
 const handleSelectionChange = (object: object[]) => {
   emits('handleSelectionChange', object, props.title)
@@ -64,41 +56,28 @@
 </script>
 
 <template>
-  <detail-block :title="title">
-    <template #btns>
-      <el-button v-if="buttonType !== 'detail'" type="info" :disabled="buttonType === 'detail'" @click="deleteRow">
-        删除行
-      </el-button>
-      <el-button v-if="buttonType !== 'detail'" type="primary" :disabled="buttonType === 'detail'" @click="addRow">
-        增加行
-      </el-button>
-    </template>
-    <el-table
-      :data="list"
-      border
-      style="width: 100%;"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="selection" width="55" />
-      <el-table-column align="center" label="序号" width="80" type="index" />
-      <el-table-column v-for="(item, index) in columns" :key="index" align="center" :label="item.text" :prop="item.value">
-        <template #header>
-          <span style="color: red;">*</span><span>{{ item.text }}</span>
-        </template>
-        <template v-if="item.text === '姓名' || item.text === '设备名称' || item.text === '文件名称'" #default="scope">
-          <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
-            <template #append>
-              <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
-                选择
-              </el-button>
-            </template>
-          </el-input>
-        </template>
-        <template v-else #default="scope">
-          <el-input v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" :disabled="buttonType === 'detail'" />
-        </template>
-      </el-table-column>
-    </el-table>
-  </detail-block>
+  <el-table
+    :data="list"
+    border
+    style="width: 100%;"
+    @selection-change="handleSelectionChange"
+  >
+    <el-table-column v-if="buttonType !== 'detail'" type="selection" width="55" />
+    <el-table-column align="center" label="序号" width="80" type="index" />
+    <el-table-column v-for="(item, index) in columns" :key="index" align="center" :width="item.width" :label="item.text" :prop="item.value">
+      <template #header>
+        <span style="color: red;">*</span><span>{{ item.text }}</span>
+      </template>
+      <template v-if="item.text === '姓名' && buttonType !== 'detail' || item.text === '设备名称' && buttonType !== 'detail' || item.text === '文件名称' && buttonType !== 'detail'" #default="scope">
+        <el-input v-model="scope.row.name" placeholder="请输入或者选择" class="input" :disabled="buttonType === 'detail'">
+          <template #append>
+            <el-button size="small" :disabled="buttonType === 'detail'" @click="selectPerson(scope.$index, item.text)">
+              选择
+            </el-button>
+          </template>
+        </el-input>
+      </template>
+    </el-table-column>
+  </el-table>
 </template>
 
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
new file mode 100644
index 0000000..6453565
--- /dev/null
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -0,0 +1,169 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import { listPageApi } from '@/api/measure/file'
+import { getDeptTreeList } from '@/api/system/dept'
+// import type { TreeStructure } from '@/views/system/user/user-interface'
+import comTreeSelect from '@/views/system/user/selecTree.vue'
+import { toTreeList } from '@/utils/structure'
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+// 查询条件
+const listQuery = ref({
+  effectiveEndTime: '',
+  effectiveStartTime: '',
+  effectiveStatus: '',
+  fileCode: '',
+  fileName: '',
+  fileNo: '',
+  fileType: '10',
+  formId: 'jlglwjsp',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  publishEndTime: '',
+  publishStartTime: '',
+})
+const loadingTable = ref<boolean>(false)
+const list = ref([]) // 表格数据
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = [
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+  },
+  {
+    text: '型号',
+    value: 'manufacturer',
+  },
+  {
+    text: '管理状态',
+    value: 'managerStateName',
+  }]
+
+// 获取数据列表
+const fetchData = () => {
+  select.value = -1
+  listPageApi(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+  })
+}
+// 搜索
+const search = () => {
+  fetchData()
+}
+const selectTreeRef = ref()
+// 重置
+const reset = () => {
+  listQuery.value = {
+    effectiveEndTime: '',
+    effectiveStartTime: '',
+    effectiveStatus: '',
+    fileCode: '',
+    fileName: '',
+    fileNo: '',
+    fileType: '10',
+    formId: 'jlglwjsp',
+    ids: [],
+    limit: 20,
+    offset: 1,
+    publishEndTime: '',
+    publishStartTime: '',
+  }
+  selectTreeRef.value.clearSelected()
+  search()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number;page?: number }) => {
+  if (val && val.size) {
+    listQuery.value.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.value.offset = val.page
+  }
+  search()
+}
+// 点击保存
+const submitForm = () => {
+  if (select.value >= 0) {
+    const person = list.value.filter((item, index) => index == select.value)[0]
+    emits('add', person)
+    dialogFormVisible.value = false
+    reset()
+  }
+  else {
+    ElMessage.warning('请先选择设备')
+  }
+}
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  reset()
+}
+// 初始化
+const initDialog = () => {
+  // reset()
+  dialogFormVisible.value = true
+  fetchData()
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择文件" width="50%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.fileName"
+          placeholder="文件名称"
+          clearable
+        />
+      </search-item>
+      <search-item>
+        <el-input
+          v-model.trim="listQuery.fileNo"
+          placeholder="文件编号"
+          clearable
+        />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" @change="changePage"
+      >
+        <template #preColumns>
+          <el-table-column label="选择" width="55" align="center">
+            <template #default="scope">
+              <el-radio v-model="select" :label="scope.$index" class="radio" />
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </div>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确认</el-button>
+        <el-button @click="resetForm">
+          取消
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<style lang="scss" scoped>
+:deep(.el-radio__label) {
+  display: none;
+}
+</style>
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index 81409c2..ff45abc 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -5,10 +5,12 @@
 import type { IOptions } from '../standard_interface'
 import baseInfo from './standardList/baseInfo.vue'
 import TemplateTable from './standardList/templateTable.vue'
-import userListDialog from '@/views/measure/person/components/userListDialog.vue'
+import userListDialog from './standardList/userListDialog.vue'
+import SelectDeviceDialog from './standardList/equipmentDialog.vue'
+import VerificationDialog from './standardList/verificationDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import { getEquipmentListPage, getEquipmenteAdd, getRegulationAdd, getRegulationListPage, getStandardLisUpdate, getStandardListAdd, getuserListPage, setBatchAdd } from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -59,6 +61,7 @@
 const close = () => {
   $router.back()
 }
+// 拿到formInline的数据
 const setData = (newValue: object) => {
   formInline.value = newValue
 }
@@ -68,71 +71,85 @@
   offset: 1,
 }
 // 关闭
+// 表头类型
 interface TableColumn {
   text: string
   value: string
   align: string
+  width?: string
 }
 
 interface checkedRecord {
   text: string
 }
-// 计量人员
-const measurementPersonnelColumns = ref<TableColumn[]>([
+// 计量人员表头
+const measurementPersonnelColumns = ref([
   { text: '姓名', value: 'name', align: 'center' },
   { text: '计量人员编号', value: 'staffNo', align: 'center' },
-  { text: '工作部门', value: 'deptName', align: 'center' },
+  { text: '工作部门', value: 'deptId', align: 'center' },
   { text: '计量专业', value: 'major', align: 'center' },
   { text: '证书编号', value: 'verifierCertificateNo', align: 'center' },
   { text: '证书有效期', value: 'certificateDate', align: 'center' },
 ])
+// 计量人员数据
 const measurementPersonnel = ref<checkedRecord[]>([])
+// 计量人员表格loading
 const measurementPersonnelLoading = ref(false)
-function fetchmeasurementPersonnel(query = { ...queryParams }) {
+// 计量人员发送请求获取数据
+function fetchmeasurementPersonnel() {
   measurementPersonnelLoading.value = true
-  measurementPersonnel.value = [{
-    text: 'xx',
-  }]
-  measurementPersonnelLoading.value = false
+  getuserListPage({ id: infoId.value }).then((res) => {
+    measurementPersonnel.value = res.data.rows
+    measurementPersonnelLoading.value = false
+  })
 }
 
-// 标准配套设备
+// 标准配套设备表头
 const corollaryEquipmentColumns = ref<TableColumn[]>([
-  { text: '设备名称', value: 'text', align: 'center' },
-  { text: '设备编号', value: 'text', align: 'center' },
-  { text: '型号', value: 'text', align: 'center' },
-  { text: '测量范围', value: 'text', align: 'center' },
-  { text: '使用部门', value: 'text', align: 'center' },
-  { text: '检定时间', value: 'text', align: 'center' },
-  { text: '检定结果', value: 'text', align: 'center' },
-  { text: '有效日期', value: 'text', align: 'center' },
+  { text: '设备名称', value: 'name', align: 'center', width: '180' },
+  { text: '设备编号', value: 'equipmentNo', align: 'center' },
+  { text: '型号', value: 'modelNo', align: 'center' },
+  { text: '测量范围', value: 'mesureRange', align: 'center' },
+  { text: '使用部门', value: 'useDept', align: 'center' },
+  { text: '检定时间', value: 'mesureDate', align: 'center' },
+  { text: '检定结果', value: 'mesureResult', align: 'center' },
+  { text: '有效日期', value: 'validDate', align: 'center' },
 ])
+// 标准配套设备数据
 const corollaryEquipment = ref<checkedRecord[]>([])
+// 标准配套设备loading
 const corollaryEquipmentLoading = ref(false)
+// 标准配套设备发送请求获取数据
 function fetchcorollaryEquipment(query = { ...queryParams }) {
   corollaryEquipmentLoading.value = true
-  corollaryEquipment.value = [{
-    text: 'xx',
-  }]
-  corollaryEquipmentLoading.value = false
+  getEquipmentListPage({ id: infoId.value }).then((res) => {
+    corollaryEquipment.value = res.data.rows.map((item) => {
+      item.name = item.equipmentName
+      return item
+    })
+    corollaryEquipmentLoading.value = false
+  })
 }
 
 // 检定规程
 const regulationVerificationColumns = ref<TableColumn[]>([
-  { text: '文件名称', value: 'text', align: 'center' },
-  { text: '文件编号', value: 'text', align: 'center' },
-  { text: '文件号', value: 'text', align: 'center' },
-  { text: '实施时间', value: 'text', align: 'center' },
-  { text: '实施状态', value: 'text', align: 'center' },
+  { text: '文件名称', value: 'name', align: 'center' },
+  { text: '文件编号', value: 'fileNo', align: 'center' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center' },
 ])
 const regulationVerification = ref<checkedRecord[]>([])
 const regulationVerificationLoading = ref(false)
 function fetchregulationVerification(query = { ...queryParams }) {
   regulationVerificationLoading.value = true
-  regulationVerification.value = [{
-    text: 'xx',
-  }]
-  regulationVerificationLoading.value = false
+  getRegulationListPage({ id: infoId.value }).then((res) => {
+    regulationVerification.value = res.data.rows.map((item) => {
+      item.name = item.fileName
+      return item
+    })
+    regulationVerificationLoading.value = false
+  })
 }
 
 // 重复性考核记录
@@ -146,9 +163,7 @@
 const repetitiveRppraisalRecordLoading = ref(false)
 function fetchrepetitiveRppraisalRecord(query = { ...queryParams }) {
   repetitiveRppraisalRecordLoading.value = true
-  repetitiveRppraisalRecord.value = [{
-    text: 'xx',
-  }]
+  repetitiveRppraisalRecord.value = []
   repetitiveRppraisalRecordLoading.value = false
 }
 
@@ -163,9 +178,7 @@
 const stabilityAssessmentRecordLoading = ref(false)
 function fetchstabilityAssessmentRecord(query = { ...queryParams }) {
   stabilityAssessmentRecordLoading.value = true
-  stabilityAssessmentRecord.value = [{
-    text: 'xx',
-  }]
+  stabilityAssessmentRecord.value = []
   stabilityAssessmentRecordLoading.value = false
 }
 
@@ -181,25 +194,17 @@
 const certificateManagementLoading = ref(false)
 function fetchcertificateManagement(query = { ...queryParams }) {
   certificateManagementLoading.value = true
-  certificateManagement.value = [{
-    text: 'xx',
-  }]
+  certificateManagement.value = []
   certificateManagementLoading.value = false
 }
 // 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
-      if (res.code === 200) {
-        close()
-      }
-    })
-  }
-  else {
-    // 打印
-
-  }
+const submitFormUpdate = () => {
+  formInline.value.id = infoId.value
+  getStandardLisUpdate(formInline.value).then((res) => {
+    if (res.code === 200) {
+      close()
+    }
+  })
 }
 const printObj = ref({
   id: 'form', // 需要打印元素的id
@@ -211,27 +216,23 @@
 })
 // 提交
 const submitForm = () => {
-  if (pageType.value === 'detail') { return submitFormDetail() }
-  ElMessageBox.confirm(
-    '确认提交吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  ).then(() => {
-    current.value = '基本信息'
-    console.log(baseInfoRef.value.submitForm(), '000')
-    baseInfoRef.value.submitForm().validate().then(() => {
-      pageType.value === 'add'
-        ? getStandardListAdd(formInline.value).then((res) => {
-          if (res.code === 200) {
-            ElMessage.success('新增成功')
-            close()
-          }
-        })
-        : submitFormDetail()
+  if (pageType.value === 'edit') { return submitFormUpdate() }
+  baseInfoRef.value.submitForm().validate().then(() => {
+    ElMessageBox.confirm(
+      '确认提交吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      getStandardListAdd(formInline.value).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success('新增成功')
+          close()
+        }
+      })
     })
   })
 }
@@ -255,11 +256,24 @@
   regulationVerification.value.push({})
   // ElMessage.warning('请先选择上一条信息')
 }
+// 设备ref
+const selectDeviceDialog = ref()
+// 检定规程ref
+const verificationDialog = ref()
+// 点击表格中的选择按钮
 function selectPerson(index: number, text: string) {
   if (text === '姓名') {
     userListRef.value.initDialog()
     listIndex.value = index
   }
+  else if (text === '设备名称') {
+    selectDeviceDialog.value.initDialog()
+    listIndex.value = index
+  }
+  else if (text === '文件名称') {
+    verificationDialog.value.initDialog()
+    listIndex.value = index
+  }
 }
 // 多选框选中
 function handleSelectionChange(Array: object[], title: string) {
@@ -277,7 +291,17 @@
 const deleteRow = (title: string) => {
   if (title === '计量人员') {
     if (measurementPersonnelSelectionList.value.length > 0) {
-      measurementPersonnel.value = measurementPersonnel.value.filter(item => !measurementPersonnelSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        measurementPersonnel.value = measurementPersonnel.value.filter(item => !measurementPersonnelSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -285,7 +309,17 @@
   }
   else if (title === '标准配套设备') {
     if (corollaryEquipmentSelectionList.value.length > 0) {
-      corollaryEquipment.value = corollaryEquipment.value.filter(item => !corollaryEquipmentSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        corollaryEquipment.value = corollaryEquipment.value.filter(item => !corollaryEquipmentSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -293,7 +327,17 @@
   }
   else if (title === '检定规程') {
     if (regulationVerificationSelectionList.value.length > 0) {
-      regulationVerification.value = regulationVerification.value.filter(item => !regulationVerificationSelectionList.value.includes(item))
+      ElMessageBox.confirm(
+      `确认删除选中的${title}列表吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+      ).then(() => {
+        regulationVerification.value = regulationVerification.value.filter(item => !regulationVerificationSelectionList.value.includes(item))
+      })
     }
     else {
       ElMessage.warning('请先选择中数据')
@@ -304,15 +348,59 @@
 const confirmPerson = (object: object) => {
   if (!measurementPersonnel.value.includes(object)) {
     measurementPersonnel.value[listIndex.value] = object
+    measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
+    measurementPersonnel.value[listIndex.value].userId = object.id
+    setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
     ElMessage.warning('该人员已经存在')
     measurementPersonnel.value.splice(listIndex.value, 1)
   }
 }
+// 选择完设备后
+const selectDeviceList = (data: object) => {
+  if (!corollaryEquipment.value.includes(data)) {
+    corollaryEquipment.value[listIndex.value] = data
+    corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
+    corollaryEquipment.value[listIndex.value].equipmentId = data.id
+    corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
+  }
+  else {
+    ElMessage.warning('该设备已经存在')
+    corollaryEquipment.value.splice(listIndex.value, 1)
+  }
+}
+// 检定规程选择完成后
+const verificationList = (data: object) => {
+  if (!regulationVerification.value.includes(data)) {
+    regulationVerification.value[listIndex.value] = data
+    regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
+    regulationVerification.value[listIndex.value].verifyRegulationId = data.id
+    regulationVerification.value[listIndex.value].name = data.fileName
+    getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
+  }
+  else {
+    ElMessage.warning('该设备已经存在')
+    regulationVerification.value.splice(listIndex.value, 1)
+  }
+}
+
+// 增加行
+const addRow = (title: string) => {
+  if (title === '计量人员') {
+    measurementPersonnelAddRow()
+  }
+  else if (title === '标准配套设备') {
+    corollaryEquipmentAddRow()
+  }
+  else if (title === '检定规程') {
+    regulationVerificationAddRow()
+  }
+}
 onMounted(() => {
   if (pageType.value === 'detail') {
-    // fetchmeasurementPersonnel()  // 计量人员
+    fetchmeasurementPersonnel() // 计量人员
     fetchcorollaryEquipment() // 标准配套设备
     fetchregulationVerification() // 检定规程
     fetchrepetitiveRppraisalRecord() // 重复性考核记录
@@ -320,7 +408,7 @@
     fetchcertificateManagement() // 证书管理
   }
   else if (pageType.value === 'edit') {
-    // fetchmeasurementPersonnel()  // 计量人员
+    fetchmeasurementPersonnel() // 计量人员
     fetchcorollaryEquipment() // 标准配套设备
     fetchregulationVerification() // 检定规程
   }
@@ -351,7 +439,7 @@
       </template>
       <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
     </detail-page>
-    <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" title="">
+    <detail-block-switch v-if="pageType === 'detail' || pageType === 'edit'" :title="pageType === 'detail' ? '' : current">
       <template #menu>
         <el-radio-group v-model="current">
           <el-radio-button v-for="item in menu" :key="item.name" :label="item.name">
@@ -359,15 +447,27 @@
           </el-radio-button>
         </el-radio-group>
       </template>
-      <template-table v-if="current === '计量人员'" title="计量人员" :button-type="pageType" :columns="measurementPersonnelColumns" :list="measurementPersonnel" :loading="measurementPersonnelLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @add-row="measurementPersonnelAddRow" @handleSelectionChange="handleSelectionChange" @change-page="fetchmeasurementPersonnel" />
-      <template-table v-if="current === '标准配套设备'" title="标准配套设备" :button-type="pageType" :columns="corollaryEquipmentColumns" :list="corollaryEquipment" :loading="corollaryEquipmentLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @change-page="fetchcorollaryEquipment" @handleSelectionChange="handleSelectionChange" @add-row="corollaryEquipmentAddRow" />
-      <template-table v-if="current === '检定规程'" title="检定规程" :button-type="pageType" :columns="regulationVerificationColumns" :list="regulationVerification" :loading="corollaryEquipmentLoading" @deleteRow="deleteRow" @selectPerson="selectPerson" @change-page="fetchregulationVerification" @handleSelectionChange="handleSelectionChange" @add-row="regulationVerificationAddRow" />
+      <template #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow(current)">
+          添加行
+        </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteRow(current)">
+          删除行
+        </el-button>
+      </template>
+      <template-table v-if="current === '计量人员'" title="计量人员" :button-type="pageType" :columns="measurementPersonnelColumns" :list="measurementPersonnel" :loading="measurementPersonnelLoading" @selectPerson="selectPerson" @handleSelectionChange="handleSelectionChange" @change-page="fetchmeasurementPersonnel" />
+      <template-table v-if="current === '标准配套设备'" title="标准配套设备" :button-type="pageType" :columns="corollaryEquipmentColumns" :list="corollaryEquipment" :loading="corollaryEquipmentLoading" @selectPerson="selectPerson" @change-page="fetchcorollaryEquipment" @handleSelectionChange="handleSelectionChange" />
+      <template-table v-if="current === '检定规程'" title="检定规程" :button-type="pageType" :columns="regulationVerificationColumns" :list="regulationVerification" :loading="corollaryEquipmentLoading" @selectPerson="selectPerson" @change-page="fetchregulationVerification" @handleSelectionChange="handleSelectionChange" />
       <template-table v-if="current === '重复性考核记录'" title="重复性考核记录" :button-type="pageType" :columns="repetitiveRppraisalRecordColumns" :list="repetitiveRppraisalRecord" :loading="repetitiveRppraisalRecordLoading" @change-page="fetchrepetitiveRppraisalRecord" />
       <template-table v-if="current === '稳定性考核记录'" title="稳定性考核记录" :button-type="pageType" :columns="stabilityAssessmentRecordColumns" :list="stabilityAssessmentRecord" :loading="stabilityAssessmentRecordLoading" @change-page="fetchstabilityAssessmentRecord" />
       <template-table v-if="current === '证书管理'" title="证书管理" :button-type="pageType" :columns="certificateManagementColumns" :list="certificateManagement" :loading="certificateManagementLoading" @change-page="fetchcertificateManagement" />
     </detail-block-switch>
     <!-- 选择用户列表组件 -->
-    <user-list-dialog ref="userListRef" :list="measurementPersonnel" @add="confirmPerson" />
+    <user-list-dialog ref="userListRef" @add="confirmPerson" />
+    <!-- 选择设备列表组件 -->
+    <select-device-dialog ref="selectDeviceDialog" @add="selectDeviceList" />
+    <!-- 选择检定规程列表组件 -->
+    <verification-dialog ref="verificationDialog" @add="verificationList" />
   </app-container>
 </template>
 
diff --git a/src/views/device/standardEquipment/expirationRemind.vue b/src/views/device/standardEquipment/expirationRemind.vue
index 5e7a7ca..9eefd7a 100644
--- a/src/views/device/standardEquipment/expirationRemind.vue
+++ b/src/views/device/standardEquipment/expirationRemind.vue
@@ -5,8 +5,8 @@
 import type { IOptions, IexpiraListQuery, IlistType } from './standard_interface'
 import { getTypeSelect } from '@/api/system/price'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
-import { exportExcel } from '@/utils/exportXlsx'
+import { getExportExcel, getRemindListPage, getStandardListDelete, getUsersDept, setRemind } from '@/api/device/standard'
+import { exportFile } from '@/utils/exportUtils'
 import { printJSON } from '@/utils/printUtils'
 // 逻辑代码
 const listQuery: Ref<IexpiraListQuery> = ref({
@@ -216,19 +216,9 @@
     background: 'rgba(255, 255, 255, 0.8)',
   })
   if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '到期提醒列表',
-      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else if (checkoutList.value.length > 0) {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '到期提醒列表',
-      titleArr: ['序号', '标准代码', '标准名称', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
+    getExportExcel(listQuery.value).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '到期提醒列表.xlsx')
     })
   }
   else {
diff --git a/src/views/device/standardEquipment/standardList.vue b/src/views/device/standardEquipment/standardList.vue
index 216f572..9ea0948 100644
--- a/src/views/device/standardEquipment/standardList.vue
+++ b/src/views/device/standardEquipment/standardList.vue
@@ -5,22 +5,27 @@
 import type { IOptions, IlistQuerys, IlistType } from './standard_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
-import { exportExcel } from '@/utils/exportXlsx'
+import { getExportExcel, getStandardList, getStandardListDelete, getUsersDept } from '@/api/device/standard'
 import { printJSON } from '@/utils/printUtils'
+import { exportFile } from '@/utils/exportUtils'
 // 逻辑代码
 // 列表查询条件
 const listQuery: Ref<IlistQuerys> = ref({
-  standardNo: '', // 标准代码
-  standardName: '', // 标准名称
   category: '', // 类别
+  id: '',
   managerState: '', // 管理状态
-  standardLaboratory: '', // 标准所在部门
-  preparationDate: '', // 筹建日期
-  id: null,
-  offset: 1, // 当前页
-  limit: 20, // 多少条
+  preparationEndDate: '', // 筹建日期结束
+  preparationStartDate: '', // 筹建日期开始
+  standardLaboratory: '', // 标准所在实验室
+  standardName: '', // 标准名称
+  standardNo: '', // 标准代码
+  validEndTime: '', // 到期结束时间
+  validStartTime: '', // 到期开始时间
+  offset: 1, // 多少页
+  limit: 20, // 一页多少条
 })
+// 筹建日期
+const preparationDate = ref('')
 const list = ref([]) // 存放数据
 // 获得权限
 const { proxy } = getCurrentInstance() as any
@@ -99,6 +104,9 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
+  // 筹建日期
+  listQuery.value.preparationStartDate = preparationDate.value[0] || ''
+  listQuery.value.preparationEndDate = preparationDate.value[1] || ''
   getStandardList(listQuery.value).then((response) => {
     list.value = response.data.rows
     total.value = parseInt(response.data.total)
@@ -136,7 +144,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -149,15 +157,18 @@
 // 点击重置
 const clearList = () => {
   listQuery.value = {
-    standardNo: '', // 标准代码
-    standardName: '', // 标准名称
     category: '', // 类别
-    managerState: '',
-    standardLaboratory: '',
-    preparationDate: '',
-    id: null,
-    offset: 1,
-    limit: 10,
+    id: '',
+    managerState: '', // 管理状态
+    preparationEndDate: '', // 筹建日期结束
+    preparationStartDate: '', // 筹建日期开始
+    standardLaboratory: '', // 标准所在实验室
+    standardName: '', // 标准名称
+    standardNo: '', // 标准代码
+    validEndTime: '', // 到期结束时间
+    validStartTime: '', // 到期开始时间
+    offset: 1, // 多少页
+    limit: 20, // 一页多少条
   }
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -168,6 +179,7 @@
   if (val && val.page) {
     listQuery.value.offset = val.page
   }
+  // 发送请求
   fetchData(true)
 }
 // 多选发生改变时
@@ -198,27 +210,30 @@
 const exportExcelBtn = () => {
   const loading = ElLoading.service({
     lock: true,
-    text: 'Loading',
+    text: '下载中请稍后',
     background: 'rgba(255, 255, 255, 0.8)',
   })
-  if (checkoutList.value.length <= 0 && list.value.length > 0) {
-    exportExcel({
-      json: list.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, categoryName: item.categoryName, standardLevel: item.standardLevel, transmitRange: item.transmitRange, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '标准装置列表',
-      titleArr: ['序号', '标准代码', '标准名称', '类别', '标准等级', '传递范围', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
-    })
-  }
-  else if (checkoutList.value.length > 0) {
-    exportExcel({
-      json: checkoutList.value.map((item: IlistType, index: number) => ({ index: index + 1, standardNo: item.standardNo, standardName: item.standardName, categoryName: item.categoryName, standardLevel: item.standardLevel, transmitRange: item.transmitRange, managerStateName: item.managerStateName, standardLaboratoryName: item.standardLaboratoryName, standardOwnerName: item.standardOwnerName, preparationDate: item.preparationDate, remark: item.remark })),
-      name: '标准装置列表',
-      titleArr: ['序号', '标准代码', '标准名称', '类别', '标准等级', '传递范围', '管理状态', '标准所在部门', '负责人', '筹建日期', '备注'],
-      sheetName: 'sheet1',
+  if (list.value.length > 0) {
+    const params = {
+      category: listQuery.value.category, // 类别
+      id: listQuery.value.id, // 	主键
+      managerState: listQuery.value.managerState, // 管理状态
+      preparationEndDate: listQuery.value.preparationEndDate, // 筹建结束日期
+      preparationStartDate: listQuery.value.preparationStartDate, // 筹建结束日期
+      standardLaboratory: listQuery.value.standardLaboratory, // 标准所在实验室
+      standardName: listQuery.value.standardName, // 标准名称
+      standardNo: listQuery.value.standardNo, // 标准代码
+      validEndTime: listQuery.value.validEndTime, // 到期结束日期
+      validStartTime: listQuery.value.validStartTime, // 到期开始日期
+      ids: checkoutList.value,
+    }
+    getExportExcel(params).then((res) => {
+      const blob = new Blob([res.data])
+      exportFile(blob, '标准装置列表.xlsx')
     })
   }
   else {
-    ElMessage.warning('暂无数据')
+    ElMessage.warning('无数据可导出数据')
   }
   loading.close()
 }
@@ -274,21 +289,21 @@
       :need-clear="true"
       @search="searchList" @clear="clearList"
     >
-      <search-item style="width: 15%;">
+      <search-item>
         <el-input
           v-model.trim="listQuery.standardNo"
           placeholder="标准代码"
           clearable
         />
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-input
           v-model.trim="listQuery.standardName"
           placeholder="标准名称"
           clearable
         />
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-select
           v-model.trim="listQuery.category"
           clearable
@@ -303,7 +318,7 @@
           />
         </el-select>
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-select
           v-model.trim="listQuery.managerState"
           clearable
@@ -318,7 +333,7 @@
           />
         </el-select>
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-select
           v-model="listQuery.standardLaboratory"
           clearable
@@ -333,14 +348,15 @@
           />
         </el-select>
       </search-item>
-      <search-item style="width: 15%;">
+      <search-item>
         <el-date-picker
-          v-model="listQuery.preparationDate"
-          type="datetime"
-          clearable
-          placeholder="筹建日期"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
+          v-model="preparationDate"
+          type="daterange"
+          range-separator="到"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          start-placeholder="筹建日期开始日期"
+          end-placeholder="筹建日期结束日期"
         />
       </search-item>
     </search-area>
diff --git a/src/views/device/standardEquipment/standard_interface.ts b/src/views/device/standardEquipment/standard_interface.ts
index 8917584..97c4b60 100644
--- a/src/views/device/standardEquipment/standard_interface.ts
+++ b/src/views/device/standardEquipment/standard_interface.ts
@@ -30,13 +30,16 @@
 
 // 标准装置列表查询条件类型
 export interface IlistQuerys {
-  standardNo: string
-  standardName: string
   category: string
+  id: string
   managerState: string
+  preparationEndDate: string
+  preparationStartDate: string
   standardLaboratory: string
-  preparationDate: string
-  id: null | string
+  standardName: string
+  standardNo: string
+  validEndTime: string
+  validStartTime: string
   offset: number
   limit: number
 }
@@ -80,7 +83,7 @@
 }
 
 // 按钮类型
-export interface Ibuttoms {
+export interface Ibuttons {
   type: 'default' | 'text' | 'primary' | 'success' | 'warning' | 'info' | 'danger'
   name: string
 }
diff --git a/src/views/measure/train/plan_interface.ts b/src/views/measure/train/plan_interface.ts
index 11d1a7c..71d8932 100644
--- a/src/views/measure/train/plan_interface.ts
+++ b/src/views/measure/train/plan_interface.ts
@@ -41,6 +41,20 @@
   limit: number
 }
 
+// 培训审批查询条件
+export interface IApprovallistQuery {
+  approvalStatus: string
+  formId: string
+  createTime: string
+  deptId: string
+  director: string
+  effectiveCompany: string
+  trainTime: string
+  offset: number
+  limit: number
+  ids?: []
+}
+
 export interface ISupplier {
   deptId: string
   createTime: string